Replace old variable values with new ones
Merge branch 'master' into prod