fix #419 improve tracing to file by file
fix failed test
.NET Foundation
Remove support for old settings controller format. Fixes #644
Merge remote-tracking branch 'upstream/master'