Dev: light can be repositiitioned
Merge branch 'development'