Add support for --mbr-manager