Slocoworking fixes
Merge branch 'develop_new' into develop