Merge pull request #1013 from pratik-joshi/CRM-12791-minor-fixes