Merge branch 'NeilCresswell-hotfixes'