Merge "Prevent advance <-> idle pingpong" into main