merged changes in build service