MDL-29226 RTL fixes - additions and amendments