[BACKLOG-17] [BACKLOG-5] Support for versioning/comments enabled flags
Merge pull request #1768 from pminutillo/squash-merge-PDI-8288

Nick said it was ok to merge this request and that he would review later