Syntax error fail on rebase
Merge remote-tracking branch 'origin/feature/CDB-801' into release/2.5.0