Master merge to delete legacy promotion

SSIA