Merge "Bidi isolate user names in block error paramters"