bugfix version 1.1 for production
Merge branch 'master' into r2_envy
completed coming on envy side