Get the environment variable in a way that works with gaenose
Merge branch 'make_default_mode_configurable'