Merge "Fix issue with inconsistent stage visibility" into main