Merged v1.61 into re-refactor-dbr:dbstruct branch. Can use meld to bring some of the work to v1.62