hpy backports

Merged Ronan Lamy requested to merge topic/default/hpy-backports into branch/default

Backport some commits from the hpy branch to default.

Merge request reports