#160
Fixes for lbx problems
Merge branch 'dev' into ms