Fixes towards CRM-12490, performance improvements, adherence to options settings
Merge pull request #659 from deepak-srivastava/mastro

Fixes towards CRM-12490, performance improvements, adherence to options ...