[PATCH OLK-5.10 00/12] Some misc changes