Modified setup scripts
Merge commit '29530c763861d9386c7a343b4ef48359b9bda869' into HEAD