Fix property interpolation for `@*` values
Merge pull request #2173 from seven-phases-max/master

Property interpolation fix for `@*` values