Merge branch 'cmFileMonitor-skip-empty-names' into release