SWITCHYARD-1394 Changes in components