Merge branch 'services' into 'master'

Fix setup of per-service decoders according to support metadata

See merge request !6