Changes which allow mixed RCT and 1x1 HF trigger primitives