Merge pull request #11905 from seamuslee001/CRM-21244-consistancy