fixing NPE when importing an app
Merge branch 'windows-file-watching-performance-improvement' into remove-initial-discover-all-nodes