Merge pull request #6071 from sudhabisht/CRM-16719