add new variable to config and clean up some comments
Also fix minor typo
Merge branch 'release/1.4' into develop