Merge branch 'master' into updates
update core to 7.27
Merge branch 'updates'