Merge remote-tracking branch 'github/pr/2081' into collectd-5.7