pull in hpstr updates applied to develop