Merge pull request #1426 from ignacionr/webclient-delay-file-creation