Merge "Move occlusion detection into logical space" into main