Merged db branch from node e2c9 into v1.62