Merge "Fix culling issue with scale" into devel/master