Merge pull request #2344 from ludovic-henry/fix-servicemodel-flakiness