Merge remote-tracking branch 'origin/moonshot-negotiate' into debian