Merge pull request #7810 from rohankatkar/CRM_18010_additionalchanges