CRM-12357 upgrade part
Merge pull request #635 from pratik-joshi/CRM-12357-upgrade-part

CRM-12357 upgrade part