Merge branch 'master' into development
Alters and updates in place to now get SL to work with new setup
remove some debug code
Merge branch 'feature/bug-bpfd-265' into development
Ready to test staging"
Merge branch 'release/release-1-16-14_1.5.0'