added comment and alternative env vars
Merge branch 'feature-comment-settings-unit-test' into develop