Merge branch '2014.7' forward into develop

We need to wait for #18525 to see if it's all good, if not, I'll fix and update this PR.