Merge proposals dependent on lp://staging/~philsf/mmrrsim/fix-lp-1260122

lp://staging/~philsf/mmrrsim/fix-lp-1260122 has no merge proposals.