Merge pull request #6560 from kurund/CRM-16719-fix