scheme lookup updated and saved to env. variable
Merge branch 'release/r2'