[RFC PATCH v5 24/24] DO NOT MERGE: only to make CI happy