Added create-service support
Bump
Merge branch 'release/1.2.21' into develop