Pull changes from dev-dbman (commit f63c5e3)