[NEO-789] NEO-789