Merge branch 'doc-find-path-variables' into release