Merge "Fixing culling for magnifier use case" into devel/master