Merge branch 'rs/pop-commit' into maint