Merge "BuildSet now has a representation"