Merge branch 'master' into partially-maximized