Merge remote-tracking branch 'jcflack/early-env'