Minors
Merge branch 'feature/autoscale-US5-US6' of github.com:slipstream/SlipStreamClient into feature/autoscale-US5-US6