Change in osmo-pcu[master]: Join ms_merge_and_clear_ms() and ms_merge_old_ms()