[PATCH v1 OLK-5.10 0/4] Add four modifications