Use constant key identifiers
Merge branch 'Service-Statemachine'