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