Merge branch 'cgroup/for-3.7-fixes' into cgroup/for-3.8