DNN-6163 - see ticket for more info on implementation