Optimized monitoring of files and parents
Merge branch 'develop'