SWITCHYARD-1338 - More updates from F2F list