Merge "Modify occluded for shade window take#2" into main