Merge "Fix occlusion/partial occlusion calculations." into main