Merged Phase2-HE17 from repository bsunanda
Merged Phase2-HE18 from repository bsunanda
Merged Phase2-HE19 from repository bsunanda
Merged Phase2-HE20 from repository bsunanda
Uncommitted files for bug fixing
The remaining ones
Merge pull request #2594 from bsunanda/Phase2-HE21

Phase2 he21