Merge branch 'rs/commit-pptr-simplify' into maint