Merge "Fix bidirection text issue" into devel/master