Adjust to the new ConfirmedState constructor
Merge branch 'master' into Service-Statemachine
Merge branch 'Service-Statemachine'