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