merge upstream changes on the calculation of mHpm (two-loop)