Merge remote-tracking branch 'github/pr/2026' into collectd-5.5