uncomment file checking
Merge remote-tracking branch '52n/master'
Merge remote-tracking branch 'origin/master' into feature/postgres-connector