Merge proposals dependent on lp://staging/ginn

lp://staging/ginn has no merge proposals.