homeware hp update
Merge branch 'hp190813' into aw13