fix bug in exception
Merge branch 'staging'
use container_envvars rather than link_variables for updating