Merge pull request #6099 from nabinhait/patch_fix_for_v6_to_v7_migration

Patch fixed for v6 to v7 migration