Update to buildsupport 4