Remove file logging
Merge remote-tracking branch 'origin/develop' into release/4.6