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

Merge the conversions to bint module option type.