Scratch

Merge proposals dependent on lp://qastaging/~gero-bare/scratch/fix-1392031-again

  1. fix-1392031-again
  2. Dependent merge proposals

lp://qastaging/~gero-bare/scratch/fix-1392031-again has no merge proposals.