fixing arrow issues
bumping up version
Merge remote-tracking branch 'origin/next-release' into next-release
bumping up version