(bug 44587) Multiple changes for trwiki

Change-Id: I67c04e1fccad55a80cae5b2519907b13d5440a35