Merge "Merge branch 'master' into extended-easysetup" into extended-easysetup