Added watchfile
Imported Upstream version 3.9.4.1
Merge tag 'upstream/3.9.4.1'

Upstream version 3.9.4.1