Merge proposals dependent on lp://staging/~philsf/mmrrsim/bp-classes-overhaul

lp://staging/~philsf/mmrrsim/bp-classes-overhaul has no merge proposals.