Merge branch 'fix/1532-fix-for-migration-fe-setting' into 'develop'