Re: Doc dir related changes coming up