SWITCHYARD-1570 Adjust for core console 1.5.4.Final