Merge "Revert^2 "Fix entry lookup in getDurationMs"" into main