Merge "add proxy hint texts"