HPSA-51 Complete
Merge branch
HPSA-51 some changes