URIEL-2970

URIEL-2970