some changes with hp state
Merge remote-tracking branch 'origin/dev' into dev