Merge branch 'topic/convert-bint' into topic/hda