Merge branch...

Merge branch 'feat/244-add-missing-device-types-in-pathcomp-computesubservices-logic' into 'develop'

Resolve "Add missing device types in PathComp ComputeSubServices logic"

See merge request !313