[PATCH conductor] rebased security patch rev2