Merge "Revert "Skip a step when blurring"" into main