Alternative means to apply the MRELEASE-812/SCM-740 fix