#12 Wrong order of the attribute replacement
Merge branch 'bug/12-attribute-replacement' into dev