diff --git a/src/app.config.json b/src/app.config.json
index 0673d0896..7d6ef8fba 100644
--- a/src/app.config.json
+++ b/src/app.config.json
@@ -9,7 +9,8 @@
             "© 2017 - 2018 Alfresco Software, Inc. All rights reserved."
     },
     "experimental": {
-        "libraries": false
+        "libraries": false,
+        "comments": false
     },
     "headerColor": "#2196F3",
     "languagePicker": false,
diff --git a/src/app/components/info-drawer/info-drawer.component.html b/src/app/components/info-drawer/info-drawer.component.html
index 985ebec34..828271da4 100644
--- a/src/app/components/info-drawer/info-drawer.component.html
+++ b/src/app/components/info-drawer/info-drawer.component.html
@@ -12,21 +12,29 @@
             </adf-content-metadata-card>
         </adf-info-drawer-tab>
 
-        <adf-info-drawer-tab [label]="'APP.INFO_DRAWER.TABS.VERSIONS' | translate">
-            <ng-container *ngIf="isFileSelected;else empty">
-                <adf-version-manager
-                    [showComments]="'adf-version-manager.allowComments' | adfAppConfig:true"
-                    [allowDownload]="'adf-version-manager.allowDownload' | adfAppConfig:true"
-                    [node]="displayNode">
-                </adf-version-manager>
-            </ng-container>
+        <ng-container *ifExperimental="'comments'; else versions">
+            <adf-info-drawer-tab [label]="'APP.INFO_DRAWER.TABS.COMMENTS' | translate">
+                <adf-comments [nodeId]="displayNode"></adf-comments>
+            </adf-info-drawer-tab>
+        </ng-container>
 
-            <ng-template #empty>
-                <div class="adf-manage-versions-empty">
-                    <mat-icon class="adf-manage-versions-empty-icon">face</mat-icon>
-                    {{ 'VERSION.SELECTION.EMPTY' | translate }}
-                </div>
-            </ng-template>
-        </adf-info-drawer-tab>
+        <ng-template #versions>
+            <adf-info-drawer-tab [label]="'APP.INFO_DRAWER.TABS.VERSIONS' | translate">
+                <ng-container *ngIf="isFileSelected;else empty">
+                    <adf-version-manager
+                        [showComments]="'adf-version-manager.allowComments' | adfAppConfig:true"
+                        [allowDownload]="'adf-version-manager.allowDownload' | adfAppConfig:true"
+                        [node]="displayNode">
+                    </adf-version-manager>
+                </ng-container>
+
+                <ng-template #empty>
+                    <div class="adf-manage-versions-empty">
+                        <mat-icon class="adf-manage-versions-empty-icon">face</mat-icon>
+                        {{ 'VERSION.SELECTION.EMPTY' | translate }}
+                    </div>
+                </ng-template>
+            </adf-info-drawer-tab>
+        </ng-template>
     </adf-info-drawer>
 </ng-container>
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index 189470c16..a9dfa968d 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -232,7 +232,8 @@
             "TITLE": "Details",
             "TABS": {
                 "PROPERTIES": "Properties",
-                "VERSIONS": "Versions"
+                "VERSIONS": "Versions",
+                "COMMENTS": "Comments"
             }
         }
     },