Merge branch 'tb/config-core-filemode-check-on-broken-fs'