Merge "Refactor mbmi_ext structure"