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