Fix a bug around HPR
Merge branch 'develop'