Merge branch 'dbtool_preselect'