Merge Master into Stable/havana to support swift keystone auth for CCP R1