Right to left fix
Merge branch 'Right-to-left-fix' into develop