Merge remote-tracking branch 'remotes/amit-migration/tags/migration-2.7-2' into staging