Merge branch 'ao/merge-verbosity-getenv-just-once'