sprint-52[SAT-1164,1179,1185,1189]
Sprint-52 SAT-1142,1147,1148,1149,1152,1153,1154,1155,1158,1159,1160
Merge Dinshaw's code with Vivek
Merge branch 'master' of github.com:Cis-Madhusudhan/satudunia
Sprint-52 SAT-1188