Merge branch 'ok/disk' into collectd-4.4