Merge branch 'topic/jack-free-fix' into topic/hda