check-in prior to one_shot changes