Update to Collect* actions to align them on a common base.