Made the version check exclusive to the diagnostics tab
Merge branch 'hotfix-2.3.16'