[Reviewer: Rob][From: Alex] Diagnostics code review.