Merge "Split visibility check" into main