Modified setup scripts
Merge commit '69cea54dd0b2403be0f8ea948635e89d81cc3797' into HEAD