Merge branch 'reduce-realpath-calls' into release