Task/392 service path merge with develop

### Description
Merge with develop
Some of the commits are REALLY old (from December last year)
I see more commits than I was expecting ...
Are these old commits just from those 'long-lived' PRs we had?

Lets look at this carefully before merging into feature/392_servicePath_in_query_update_context