Merge branch 't/hup_fix'