Merge branch 'master' into easysetup and fixed OCStack issue