Merge branch 'patch-enabled-services' into 'stable-3.1'

Check if we actually have a service enabled

See merge request !1059