Fixes issue with left and right not acting as expected.
Merge branch 'refs/heads/master' into develop
Merge remote-tracking branch 'origin/develop'