Merge pull request #700 from sir-gon/renovate/packaging-25.x

Merge pull request #700 from sir-gon/renovate/packaging-25.x #775