Merge "Opportunistic comment fix"