Merge branch 'manish' into slohia
Merge branch 'slohia' of https://github.com/slohia/ADS into slohia
Merge branch 'slohia' of https://github.com/slohia/ADS into slohia
modifications to client package