VAL-12499

VAL-12499