Merge branch 'lasers-feature' into development