NN-10534 | Code review