Merge branch 'sr/hooks-cwd-doc'