Minor: fix warning
Merge remote-tracking branch 'origin/1.7.2' into 1.7.2
Fix case when reused db that is not set in thread local.