[NEO-372] NEO-372