Merge branch 'fix/do-split-migration-for-local-users-only' into 'develop'