[CLC-2269] Friendly block message fixes