DNN-5079 manual merge pull request