[CT-13] VADIM'S commit