Merge branch 'collectd-5.9' into collectd-5.10