Merge "Fix character direction logic" into devel/master