Merge tag 'hax-v6-pull-request'