Merge MBDA-specific work in the MBDA master for tagging