task: #3628421 Keep service ID declared with classes

Closes #3628421

Merge request reports

Loading
Loading