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