Follow-up r95930, consolidate into one message per CR