Add note on how to change the service settings.
Add note on how to change the service settings.
Merge branch 'master' into pre-release