CONTENT-3058 - Control Panel Changes