While here, pass maintainership to Krzysztof. PR: 267465 Approved by: Andre Rikkert de Koe, Krzysztof (maintainer)