Climbing improvements
Merge PR #1340 by @meniku - climbing improvements