Merging from the main hpparvi branch.