Selected commits merge to Stable/havana to support CCP R1 functionality