[PATCH conductor] Revision of #2310