CRM-12427 Fixes and patch
Merge pull request #547 from deepak-srivastava/ninja

CRM-12427 Fixes and patch