HomePhorge

Merge branch 'ticket/2.6.next/7018-clarify_service_type_behavior' into 2.6.next
35b4c4a1004dUnpublished