Merge "Improvements in ServiceDecomposition"