Diagnostics clean-up#34

mingxwa wants to merge 2 commits intongcpp:mainngcpp/proxy:mainfrom

mingxwa:user/mingxwa/clean-up-diagnosticsmingxwa/proxy:user/mingxwa/clean-up-diagnosticsCopy head branch name to clipboard