Merge remote-tracking branch 'origin/extended-easysetup'