Merge remote-tracking branch 'github/pr/2391' into collectd-5.6