Merge remote-tracking branch 'github/pr/413' into collectd-5.4