DDBTEST 27 - Fix.
Merge remote-tracking branch 'origin/DDBTEST-27' into develop