Merge "Bug 499604 : replace the links by object's name, amend comments"