Add code for troubleshooting menu and other endpoints bug #7741