MPIR-298 merged