Allowed to switch databases for a specific query.
Merge branch 'pr/676'