Merge branch 'db/diff-to-fp'