add missing commits as part of backporting of RT10481 to 2.1 branch