LAS-96 commit to master

previously only committed to 0.2-fixes