[ticket/12553] Right-to-left fixes