Ensure close for every thread where db connection is not automatically closed
Merge remote-tracking branch 'origin/master'