Merge all changes of easy setup in master branch to 1.2-rel branch