Update the backend
Merge remote-tracking branch 'upstream/seven-year-itch' into seven-year-itch