Merge remote-tracking branch 'origin/pr/409' into collectd-5.4