fix update user properties patch
fix patches
Merge pull request #1616 from pdvyas/migrate-3to4

3 to 4 migration fixes