Merge pull request #1238 from sfe-ev/CRM-12995_amend