potential fix for scoped_db_conn_test
Merge branch 'fix-scoped-test' into legacy