SWITCHYARD-1394 Follow up of changes in core.