[BACKLOG-17] [BACKLOG-5] Support for versioning/comments enabled flags