Dealing with both directions in wrapping now.
Merge branch 'develop_2_3_1' into develop