Patch changes for 3 to 4 migration
Merge pull request #1612 from pdvyas/migrate-3to4

3 to 4 migration