Phase2 he29

Necessary to have these changes to complement the changes in bsunanda:Phase2-HE28 and also a tag kpedro88:Phase2-HE29