Merge changes from topic "collectd_6_testing"