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