DNN-3619 code corrections