Switchyard 1831

#630 (SWITCHYARD-1886) needs to be processed prior to this one.