Merge branch 'fix/2585-config-migration-dir' into 'develop'