Merge stable/havana into ccp