support attribute variables
refactoring
Merge commit 'c1c406c1afc0270911a48f6c6902b73c224cc699'