defects

2243
2327
2245
2268
2330
2418
defect

2314
Merge branch 'master' into Saumya
fix 2425
defect 2433
Merge branch 'Saumya'
Merge branch 'master' of https://github.com/SaumyaS/HDS-origin
Merge branch 'master' into Kevin