Merge branch 'sp/maint-plug-traverse-commit-list-leak' into maint