Merge pull request #2323 from esdrubal/servicemodel