Merge commit 'ms/ppp-update'