Merge branch 'bjorn-HID' into release