fix bug 992860, 992855, 992531 - RTL updates
Merge pull request #2260 from darkwing/rtl-updates

fix bug 992860, 992855, 992531 - RTL updates