Extra tooltip and word from the un-picked commit
Cherry pick f3019a8111f25ef0400c287d851b992d4ca3d839