STS-3179 Options variables are now defined using ${varname} pattern