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

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