[minor] Broke a long line of code, minor adjustments to copy.
Merge branch 'master' into path_cache_spike