CRM-13973-qa : fixed for points mentioned in #comment-58264
Merge pull request #2661 from pratik-joshi/CRM-13973-qa

CRM-13973-qa : fixed for points mentioned in #comment-58264