DNN-5991 - Control Panel Changes