Merge "Revert setWhen change" into main