Port to Release/3.1 - enabling MHR support (#26803)