SWITCHYARD-1886 checkpoint Dec 18