Merge branch 'collectd-5.3' into collectd-5.4