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