Merge "CORD-3058 updating setup script"