[AVSA-389]

[AVSA-389]