cleanup: use sp instead of dip
cleanup: fix typo in release notes
Merge branch 'release' into upstream