Changed interface returns and simplified configuration(s) because we only have 1 row
Merge branch 'master' into Service-Statemachine
Work in progress