Merging feature 392 (service paths) in develop