CRM-14968
Additional Fixes
Merge pull request #4379 from jitendrapurohit/CRM-14968

CRM-14968