Merge "Add missing bundle converters"