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