Merge pull request #7548 from wdecraene/CRM-15267