Merge branch 'improve-server-config-examples' into 'develop'