merging chunk-11 service stubs into git