Support to have comment inside a TextElement
Bump version and changelog
Merge branch 'release/0.3.6.2' into develop