Merge proposals dependent on lp://staging/~ttosttos/eidete/fix-989076

lp://staging/~ttosttos/eidete/fix-989076 has no merge proposals.