Fixes #897
Merge remote-tracking branch 'origin/67159136_LightShelfBug' into develop