Merge branch 'th/t9903-symlinked-workdir'