Fixed the service selection with a REST request
Merge remote-tracking branch 'soapower/1.4.x' into 1.4.x