Fixes #6220 Move System check menu to Diagnostic section