Merge branch 'oreo_fileObserver' into issue_124_skipToCompleteScan

1 job for issue_124_skipToCompleteScan in 3 minutes and 23 seconds (queued for 3 seconds)