CORE-11 Add location to service request messages