Merge branch 'rs/refresh-beyond-symlink'