variable substitution also in deployable archives
Merge branch 'master' into performance_optimizations