Fixed post-merge test failure
Merge branch 'ddb'