Merge branches 'topic/fix/misc' and 'topic/fix/hda' into for-linus