update repos env api
Merge remote-tracking branch 'upstream/develop' into develop
update repo env based on api changes.