DC/Pooja | #3788 | updated setup scripts