Merge branch 'rs/pop-commit'