[CLC-2269] Friendly block message fixes
Merge pull request #1353 from yuhunglin/CLC-2269

[CLC-2269] Friendly block messages fixes