Turn some debug statements into trace
Self made scoped lock did not work at all
Merge branch 'master' into builds
7.262