Code

Merge remote-tracking branch 'github/pr/1088' into collectd-5.4