SWITCHYARD-1886 checkpoint 12/20