Merge pull request #8841 from lnslbrty/update/ptunnel-ng