Support content attribute
Merge branch 'develop'