support content property from config.xml
Merge upstream/master