3.6.x Cherry-picks

File monitoring and David Volgyes' fixes.