Enable comparison of local files
Merge branch 'feature/compare-local' into develop