Merge proposals dependent on lp://staging/i2ce/4.0-dev

lp://staging/i2ce/4.0-dev has no merge proposals.