Rebased/dev 4 4/admin diagnostics case insensitive develop

Backport of PR #1117 from `develop` to `dev_4_4`.