Merge service foundation into DEV