Merge branch 'topic/ice1724-quartet' into topic/hda