BUGFIX need to set hasDynamicContent to TRUE if element contains
comment-statements (i.e. these need to be removed upon rendering)
Merge remote-tracking branch 'origin/master'