REL-1501: Fixed (partially?) some syncrhonization issues for the build.