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