Merge branch 'ppp-update' into beyond-next