Merge branch 'fix_cbrank_error_with_sync_off' into development.
Dont multiply commandexecutor instances.
Overriding development branch to bring it in line with the V2 development branch.