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

This reverts commit 63d0da3c34e1050252025526def449b257b4a95b, reversing
changes made to 99103f58385be404e3f975f74d7f702e10803057. (reverted from commit d2c933e03b1391cf71e931ecd8e2b18bb8e12ddb)