Merge branch 'fix/configdb-migration-with-deprecated' into 'develop'