Fix towards CRM-12490
Merge pull request #643 from deepak-srivastava/mastro

Fix towards CRM-12490