Merge pull request #7850 from McGiverGim/blackbox_dterm2_type