Merge pull request #2353 from ludovic-henry/fix-servicemodel-15153