[CLC-2269] Friendly block messages fixes

JIRA: https://jira.media.berkeley.edu/jira/browse/CLC-2269