VALOR-11156

VALOR-11156