CORE-11 Add support for location in service request messages