FX-180, FX-183
Merge branch 'dev' of github.com:fix8/fix8 into dev
FX-180, FX-183, FX-184, FX-187, FX-189