Resolve "Improve Semantic Service handling"

Closes #318

Merge request reports

Loading