Modified setup scripts
Merge commit '2f2a3258737cf2c1afd42f5fed3a1874c7cc3e07' into HEAD