set 3 and 6 fix
Merge branch 'devel-next' of https://github.com/jfharney/DiagnosticsViewer into devel-next