Merge branch 'master' into extended-easysetup