Merge pull request #18358 from clarkwang/passh-update