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