Update to buildsupport 7