Merge "Add ABI check to IMapper5"