Close #232 by porting changes to HHU