XX-10684 - fix cdr tests/precommit