BITMAG-1006 Merge client modules into single module: Ready for test
Merge branch 'module-merge'