Revert "Revert "Merge remote-tracking branch 'origin/testbranch' into dev_CB""

This reverts commit d2c933e03b1391cf71e931ecd8e2b18bb8e12ddb.