Fix #5382 - Add migration and fix so tombstones are removed from collections