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