Merge branch 'ff/types' into collectd-4