Switchyard 2162

This needs to be pushed after 2133. Please let me know after that push and I can rebase.