Fry

Merge proposals dependent on lp://staging/~quartz25/fry/refactor0

lp://staging/~quartz25/fry/refactor0 has no merge proposals.