Merge service-foundation into dev

Updating dev branch with service code.