DNN-3623 - refactoring