Merge branch 'master' into security-updates
update core
Merge branch 'security-updates'