Bringing lattice up to date with commits in dblayer.