MDL-40230: BACKPORT RTL fixes