Aravind | #240 | Changed timeout to 5s