FX-394,FX-385,FX-377,FX-372,FX-355,FX-323
Merge branch 'dev' of github.com:fix8/fix8 into dev