Merge proposals dependent on lp://staging/~daker/summit/fix.1147863

lp://staging/~daker/summit/fix.1147863 has no merge proposals.