[PATCH OLK-5.10 0/3] adjusting the interface to adapt to the cca community