Start to implement Service Interface implementation discovery
Fix Git collisions, check in changes
Fix Git collisions, check in changes