Feature/NN-10534