Merge ihplus branch to master

Reviewer: trivial