[OE-3605] this shouldn't be commented out
[OE-3479] comments not required field on generic elements
Merge branch 'release/1.5' into feature/table-versioning