Merge commit 'b0a271404fefe9719df3f5b651c479aaaee93371' into develop

Refine UI of contributor comments by partial