fix #2815 trackable logging
Merge remote-tracking branch 'origin/release'