merged with latest v1.63, fixed merge conflicts with db.scm