diff --git a/tests/acceptance/features/apiFavorites/favorites.feature b/tests/acceptance/features/apiFavorites/favorites.feature
index cafd56737aed..ffae3290097a 100644
--- a/tests/acceptance/features/apiFavorites/favorites.feature
+++ b/tests/acceptance/features/apiFavorites/favorites.feature
@@ -211,7 +211,7 @@ Feature: favorite
       | new         |
 
   @files_sharing-app-required @toImplementOnOCIS
-  @skipOnOcis @issue-ocis-reva-243
+  @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-243
   Scenario Outline: sharee file favorite state should not change the favorite state of sharer
     Given using <dav_version> DAV path
     And user "Brian" has been created with default attributes and without skeleton files
diff --git a/tests/acceptance/features/apiShareCreateSpecial1/createShareReceivedInMultipleWays.feature b/tests/acceptance/features/apiShareCreateSpecial1/createShareReceivedInMultipleWays.feature
index 6b3ca0ca4b7f..ac00db82783f 100644
--- a/tests/acceptance/features/apiShareCreateSpecial1/createShareReceivedInMultipleWays.feature
+++ b/tests/acceptance/features/apiShareCreateSpecial1/createShareReceivedInMultipleWays.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required @skipOnOcis @issue-ocis-reva-34
+@api @files_sharing-app-required @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-34
 Feature: share resources where the sharee receives the share in multiple ways
 
   Background:
diff --git a/tests/acceptance/features/apiShareCreateSpecial1/createShareUniqueReceivedNames.feature b/tests/acceptance/features/apiShareCreateSpecial1/createShareUniqueReceivedNames.feature
index b863fef3a0d7..a67b4b2070ad 100644
--- a/tests/acceptance/features/apiShareCreateSpecial1/createShareUniqueReceivedNames.feature
+++ b/tests/acceptance/features/apiShareCreateSpecial1/createShareUniqueReceivedNames.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required @skipOnOcis @issue-ocis-reva-11 @issue-ocis-reva-243
+@api @files_sharing-app-required @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-11 @issue-ocis-reva-243
 Feature: resources shared with the same name are received with unique names
 
   Background:
diff --git a/tests/acceptance/features/apiShareCreateSpecial2/createShareGroupAndUserWithSameName.feature b/tests/acceptance/features/apiShareCreateSpecial2/createShareGroupAndUserWithSameName.feature
index cee40693e66a..d9c25f7cc925 100644
--- a/tests/acceptance/features/apiShareCreateSpecial2/createShareGroupAndUserWithSameName.feature
+++ b/tests/acceptance/features/apiShareCreateSpecial2/createShareGroupAndUserWithSameName.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required @skipOnOcis @issue-ocis-reva-34 @issue-ocis-reva-243
+@api @files_sharing-app-required @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-34 @issue-ocis-reva-243
 Feature: sharing works when a username and group name are the same
 
   Background:
diff --git a/tests/acceptance/features/apiShareCreateSpecial2/createShareGroupCaseSensitive.feature b/tests/acceptance/features/apiShareCreateSpecial2/createShareGroupCaseSensitive.feature
index 4bec8eea5e2d..7e0866005291 100644
--- a/tests/acceptance/features/apiShareCreateSpecial2/createShareGroupCaseSensitive.feature
+++ b/tests/acceptance/features/apiShareCreateSpecial2/createShareGroupCaseSensitive.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required @skipOnOcis @issue-ocis-reva-34 @issue-ocis-reva-243
+@api @files_sharing-app-required @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-34 @issue-ocis-reva-243
 Feature: share with groups, group names are case-sensitive
 
   Background:
diff --git a/tests/acceptance/features/apiShareCreateSpecial2/createShareWithDisabledUser.feature b/tests/acceptance/features/apiShareCreateSpecial2/createShareWithDisabledUser.feature
index fb649948987f..bdce6841a9fa 100644
--- a/tests/acceptance/features/apiShareCreateSpecial2/createShareWithDisabledUser.feature
+++ b/tests/acceptance/features/apiShareCreateSpecial2/createShareWithDisabledUser.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required @skipOnOcis @issue-ocis-reva-243
+@api @files_sharing-app-required @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-243
 Feature: share resources with a disabled user
 
   Background:
diff --git a/tests/acceptance/features/apiShareCreateSpecial2/createShareWithInvalidPermissions.feature b/tests/acceptance/features/apiShareCreateSpecial2/createShareWithInvalidPermissions.feature
index b961076f9ffe..60657106b6c8 100644
--- a/tests/acceptance/features/apiShareCreateSpecial2/createShareWithInvalidPermissions.feature
+++ b/tests/acceptance/features/apiShareCreateSpecial2/createShareWithInvalidPermissions.feature
@@ -28,7 +28,7 @@ Feature: cannot share resources with invalid permissions
       | 1               | 404             | 200              | PARENT        | 32          |
       | 2               | 404             | 404              | PARENT        | 32          |
 
-  @skipOnOcis @issue-ocis-reva-45 @issue-ocis-reva-243
+  @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-45 @issue-ocis-reva-243
   Scenario Outline: Cannot create a share of a file with a user with only create permission
     Given using OCS API version "<ocs_api_version>"
     And user "Brian" has been created with default attributes and without skeleton files
@@ -63,7 +63,7 @@ Feature: cannot share resources with invalid permissions
       | 1               | 100               | 996               | 200                | 500                |
       | 2               | 200               | 996               | 200                | 500                |
 
-  @skipOnOcis @issue-ocis-reva-45 @issue-ocis-reva-243
+  @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-45 @issue-ocis-reva-243
   Scenario Outline: Cannot create a share of a file with a user with only (create,delete) permission
     Given using OCS API version "<ocs_api_version>"
     And user "Brian" has been created with default attributes and without skeleton files
diff --git a/tests/acceptance/features/apiShareManagement/mergeShare.feature b/tests/acceptance/features/apiShareManagement/mergeShare.feature
index d225a7d4b210..0a883721d666 100644
--- a/tests/acceptance/features/apiShareManagement/mergeShare.feature
+++ b/tests/acceptance/features/apiShareManagement/mergeShare.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required @skipOnOcis @issue-ocis-reva-34 @issue-ocis-reva-243
+@api @files_sharing-app-required @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-34 @issue-ocis-reva-243
 Feature: sharing
 
   Background:
diff --git a/tests/acceptance/features/apiShareManagement/moveReceivedShare.feature b/tests/acceptance/features/apiShareManagement/moveReceivedShare.feature
index fca4e3bbc636..998a0d8a612d 100644
--- a/tests/acceptance/features/apiShareManagement/moveReceivedShare.feature
+++ b/tests/acceptance/features/apiShareManagement/moveReceivedShare.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required @skipOnOcis @issue-ocis-reva-14 @issue-ocis-reva-243
+@api @files_sharing-app-required @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-14 @issue-ocis-reva-243
 Feature: sharing
 
   Background:
diff --git a/tests/acceptance/features/apiShareManagementBasic/createShare.feature b/tests/acceptance/features/apiShareManagementBasic/createShare.feature
index 213dd7ae881c..7e8a769b3852 100644
--- a/tests/acceptance/features/apiShareManagementBasic/createShare.feature
+++ b/tests/acceptance/features/apiShareManagementBasic/createShare.feature
@@ -7,7 +7,7 @@ Feature: sharing
 
   @smokeTest
   @skipOnEncryptionType:user-keys @issue-32322
-  @skipOnOcis @issue-ocis-reva-11 @issue-ocis-reva-243
+  @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-11 @issue-ocis-reva-243
   Scenario Outline: Creating a share of a file with a user, the default permissions are read(1)+update(2)+can-share(16)
     Given using OCS API version "<ocs_api_version>"
     And user "Brian" has been created with default attributes and without skeleton files
@@ -34,7 +34,7 @@ Feature: sharing
 
   @smokeTest
   @skipOnEncryptionType:user-keys @issue-32322
-  @skipOnOcis @issue-ocis-reva-11 @issue-ocis-reva-243
+  @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-11 @issue-ocis-reva-243
   Scenario Outline: Creating a share of a file containing commas in the filename, with a user, the default permissions are read(1)+update(2)+can-share(16)
     Given using OCS API version "<ocs_api_version>"
     And user "Brian" has been created with default attributes and without skeleton files
@@ -272,7 +272,7 @@ Feature: sharing
       | 1               | 100             |
       | 2               | 200             |
 
-  @smokeTest @skipOnOcis @issue-ocis-reva-34 @issue-ocis-reva-243
+  @smokeTest @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-34 @issue-ocis-reva-243
   Scenario Outline: Share of folder to a group
     Given using OCS API version "<ocs_api_version>"
     And these users have been created with default attributes and without skeleton files:
@@ -300,7 +300,7 @@ Feature: sharing
       | 1               | 100             |
       | 2               | 200             |
 
-  @skipOnOcis @issue-ocis-reva-34 @issue-ocis-reva-243
+  @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-34 @issue-ocis-reva-243
   Scenario Outline: sharing again an own file while belonging to a group
     Given using OCS API version "<ocs_api_version>"
     And user "Brian" has been created with default attributes and without skeleton files
@@ -317,7 +317,7 @@ Feature: sharing
       | 1               | 100             |
       | 2               | 200             |
 
-  @skipOnOcis @issue-ocis-reva-372 @issue-ocis-reva-243 @toImplementOnOCIS
+  @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-372 @issue-ocis-reva-243 @toImplementOnOCIS
   Scenario Outline: sharing subfolder of already shared folder, GET result is correct
     Given using OCS API version "<ocs_api_version>"
     And these users have been created with default attributes and without skeleton files:
@@ -380,7 +380,7 @@ Feature: sharing
       | 1               | 200              | 996             |
       | 2               | 500              | 996             |
 
-  @skipOnOcis @issue-ocis-reva-14 @issue-ocis-reva-243
+  @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-14 @issue-ocis-reva-243
   Scenario Outline: user shares a file with file name longer than 64 chars to another user
     Given using OCS API version "<ocs_api_version>"
     And user "Brian" has been created with default attributes and without skeleton files
@@ -410,7 +410,7 @@ Feature: sharing
       | 1               | 100             |
       | 2               | 200             |
 
-  @skipOnOcis @issue-ocis-reva-14 @issue-ocis-reva-243 @issue-ocis-reva-12
+  @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-14 @issue-ocis-reva-243 @issue-ocis-reva-12
   Scenario Outline: user shares a folder with folder name longer than 64 chars to another user
     Given using OCS API version "<ocs_api_version>"
     And user "Brian" has been created with default attributes and without skeleton files
diff --git a/tests/acceptance/features/apiShareManagementBasic/deleteShare.feature b/tests/acceptance/features/apiShareManagementBasic/deleteShare.feature
index 3f34c1ebc41c..097f3e3948a2 100644
--- a/tests/acceptance/features/apiShareManagementBasic/deleteShare.feature
+++ b/tests/acceptance/features/apiShareManagementBasic/deleteShare.feature
@@ -64,7 +64,7 @@ Feature: sharing
     Then the HTTP status code should be "204"
     And as "Brian" folder "/sub" should not exist
 
-  @smokeTest @files_trashbin-app-required @skipOnOcis @toFixOnOCIS @issue-ocis-reva-243
+  @smokeTest @files_trashbin-app-required @skipOnOcis @toImplementOnOCIS @toFixOnOCIS @issue-ocis-reva-243
   Scenario: deleting a file out of a share as recipient creates a backup for the owner
     Given using OCS API version "1"
     And user "Alice" has been created with default attributes and skeleton files
@@ -79,7 +79,7 @@ Feature: sharing
     And as "Alice" file "/shared_file.txt" should exist in the trashbin
     And as "Brian" file "/shared_file.txt" should exist in the trashbin
 
-  @files_trashbin-app-required @skipOnOcis @toFixOnOCIS @issue-ocis-reva-243
+  @files_trashbin-app-required @skipOnOcis @toImplementOnOCIS @toFixOnOCIS @issue-ocis-reva-243
   Scenario: deleting a folder out of a share as recipient creates a backup for the owner
     Given using OCS API version "1"
     And user "Alice" has been created with default attributes and skeleton files
@@ -115,7 +115,7 @@ Feature: sharing
     And the etag of element "/" of user "Brian" should have changed
     And the etag of element "/PARENT" of user "Carol" should not have changed
 
-  @skipOnOcis @toFixOnOCIS @issue-ocis-reva-243
+  @skipOnOcis @toImplementOnOCIS @toFixOnOCIS @issue-ocis-reva-243
   Scenario: sharee of a read-only share folder tries to delete the shared folder
     Given using OCS API version "1"
     And user "Alice" has been created with default attributes and skeleton files
@@ -127,7 +127,7 @@ Feature: sharing
     Then the HTTP status code should be "403"
     And as "Brian" file "/shared/shared_file.txt" should exist
 
-  @skipOnOcis @toFixOnOCIS @issue-ocis-reva-243
+  @skipOnOcis @toImplementOnOCIS @toFixOnOCIS @issue-ocis-reva-243
   Scenario: sharee of a upload-only shared folder tries to delete a file in the shared folder
     Given using OCS API version "1"
     And user "Alice" has been created with default attributes and skeleton files
@@ -139,7 +139,7 @@ Feature: sharing
     Then the HTTP status code should be "403"
     And as "Alice" file "/shared/shared_file.txt" should exist
 
-  @skipOnOcis @toFixOnOCIS @issue-ocis-reva-243
+  @skipOnOcis @toImplementOnOCIS @toFixOnOCIS @issue-ocis-reva-243
   Scenario: sharee of an upload-only shared folder tries to delete their file in the folder
     Given using OCS API version "1"
     And these users have been created with default attributes and without skeleton files:
@@ -178,7 +178,7 @@ Feature: sharing
       | /PARENT            | 1               | 200              | PARENT         |
       | /PARENT            | 2               | 404              | PARENT         |
 
-  @skipOnOcis @toFixOnOCIS @issue-ocis-reva-243 @issue-ocis-reva-364
+  @skipOnOcis @toImplementOnOCIS @toFixOnOCIS @issue-ocis-reva-243 @issue-ocis-reva-364
   Scenario Outline: An individual share recipient tries to delete the share
     Given using OCS API version "<ocs_api_version>"
     And user "Alice" has been created with default attributes and skeleton files
diff --git a/tests/acceptance/features/apiShareOperations/changingFilesShare.feature b/tests/acceptance/features/apiShareOperations/changingFilesShare.feature
index 3b5aa8fb8160..adf13d750332 100644
--- a/tests/acceptance/features/apiShareOperations/changingFilesShare.feature
+++ b/tests/acceptance/features/apiShareOperations/changingFilesShare.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required @skipOnOcis @issue-ocis-reva-14 @issue-ocis-reva-243
+@api @files_sharing-app-required @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-14 @issue-ocis-reva-243
 Feature: sharing
 
   Background:
diff --git a/tests/acceptance/features/apiShareOperations/getWebDAVSharePermissions.feature b/tests/acceptance/features/apiShareOperations/getWebDAVSharePermissions.feature
index 96c3bde0b377..ed8eb79ef281 100644
--- a/tests/acceptance/features/apiShareOperations/getWebDAVSharePermissions.feature
+++ b/tests/acceptance/features/apiShareOperations/getWebDAVSharePermissions.feature
@@ -35,7 +35,7 @@ Feature: sharing
       | old      |
       | new      |
 
-  @skipOnOcis @issue-ocis-reva-243
+  @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-243
   Scenario Outline: Correct webdav share-permissions for received file with edit and reshare permissions
     Given using <dav-path> DAV path
     And user "Alice" has uploaded file with content "foo" to "/tmp.txt"
@@ -49,7 +49,7 @@ Feature: sharing
       | old      |
       | new      |
 
-  @skipOnOcis @issue-ocis-reva-243
+  @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-243
   Scenario Outline: Correct webdav share-permissions for received group shared file with edit and reshare permissions
     Given using <dav-path> DAV path
     And group "grp1" has been created
@@ -69,7 +69,7 @@ Feature: sharing
       | old      |
       | new      |
 
-  @skipOnOcis @issue-ocis-reva-243
+  @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-243
   Scenario Outline: Correct webdav share-permissions for received file with edit permissions but no reshare permissions
     Given using <dav-path> DAV path
     And user "Alice" has uploaded file with content "foo" to "/tmp.txt"
@@ -82,7 +82,7 @@ Feature: sharing
       | old      |
       | new      |
 
-  @skipOnOcis @issue-ocis-reva-243
+  @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-243
   Scenario Outline: Correct webdav share-permissions for received group shared file with edit permissions but no reshare permissions
     Given using <dav-path> DAV path
     And group "grp1" has been created
@@ -102,7 +102,7 @@ Feature: sharing
       | old      |
       | new      |
 
-  @skipOnOcis @issue-ocis-reva-243
+  @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-243
   Scenario Outline: Correct webdav share-permissions for received file with reshare permissions but no edit permissions
     Given using <dav-path> DAV path
     And user "Alice" has uploaded file with content "foo" to "/tmp.txt"
@@ -115,7 +115,7 @@ Feature: sharing
       | old      |
       | new      |
 
-  @skipOnOcis @issue-ocis-reva-243
+  @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-243
   Scenario Outline: Correct webdav share-permissions for received group shared file with reshare permissions but no edit permissions
     Given using <dav-path> DAV path
     And group "grp1" has been created
@@ -148,7 +148,7 @@ Feature: sharing
       | old      |
       | new      |
 
-  @skipOnOcis @issue-ocis-reva-243
+  @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-243
   Scenario Outline: Correct webdav share-permissions for received folder with all permissions
     Given using <dav-path> DAV path
     And user "Alice" has created folder "/tmp"
@@ -162,7 +162,7 @@ Feature: sharing
       | old      |
       | new      |
 
-  @skipOnOcis @issue-ocis-reva-243
+  @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-243
   Scenario Outline: Correct webdav share-permissions for received group shared folder with all permissions
     Given using <dav-path> DAV path
     And group "grp1" has been created
@@ -181,7 +181,7 @@ Feature: sharing
       | old      |
       | new      |
 
-  @skipOnOcis @issue-ocis-reva-243
+  @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-243
   Scenario Outline: Correct webdav share-permissions for received folder with all permissions but edit
     Given using <dav-path> DAV path
     And user "Alice" has created folder "/tmp"
@@ -194,7 +194,7 @@ Feature: sharing
       | old      |
       | new      |
 
-  @skipOnOcis @issue-ocis-reva-243
+  @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-243
   Scenario Outline: Correct webdav share-permissions for received group shared folder with all permissions but edit
     Given using <dav-path> DAV path
     And group "grp1" has been created
@@ -214,7 +214,7 @@ Feature: sharing
       | old      |
       | new      |
 
-  @skipOnOcis @issue-ocis-reva-243
+  @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-243
   Scenario Outline: Correct webdav share-permissions for received folder with all permissions but create
     Given using <dav-path> DAV path
     And user "Alice" has created folder "/tmp"
@@ -227,7 +227,7 @@ Feature: sharing
       | old      |
       | new      |
 
-  @skipOnOcis @issue-ocis-reva-243
+  @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-243
   Scenario Outline: Correct webdav share-permissions for received group shared folder with all permissions but create
     Given using <dav-path> DAV path
     And group "grp1" has been created
@@ -247,7 +247,7 @@ Feature: sharing
       | old      |
       | new      |
 
-  @skipOnOcis @issue-ocis-reva-243
+  @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-243
   Scenario Outline: Correct webdav share-permissions for received folder with all permissions but delete
     Given using <dav-path> DAV path
     And user "Alice" has created folder "/tmp"
@@ -260,7 +260,7 @@ Feature: sharing
       | old      |
       | new      |
 
-  @skipOnOcis @issue-ocis-reva-243
+  @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-243
   Scenario Outline: Correct webdav share-permissions for received group shared folder with all permissions but delete
     Given using <dav-path> DAV path
     And group "grp1" has been created
@@ -280,7 +280,7 @@ Feature: sharing
       | old      |
       | new      |
 
-  @skipOnOcis @issue-ocis-reva-243
+  @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-243
   Scenario Outline: Correct webdav share-permissions for received folder with all permissions but share
     Given using <dav-path> DAV path
     And user "Alice" has created folder "/tmp"
@@ -293,7 +293,7 @@ Feature: sharing
       | old      |
       | new      |
 
-  @skipOnOcis @issue-ocis-reva-243
+  @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-243
   Scenario Outline: Correct webdav share-permissions for received group shared folder with all permissions but share
     Given using <dav-path> DAV path
     And group "grp1" has been created
diff --git a/tests/acceptance/features/apiShareOperations/gettingShares.feature b/tests/acceptance/features/apiShareOperations/gettingShares.feature
index c43de5b656d1..4a23ac0d2a0f 100644
--- a/tests/acceptance/features/apiShareOperations/gettingShares.feature
+++ b/tests/acceptance/features/apiShareOperations/gettingShares.feature
@@ -54,7 +54,7 @@ Feature: sharing
       | 1               | 100             |
       | 2               | 200             |
 
-  @skipOnOcis @smokeTest @issue-ocis-reva-243
+  @skipOnOcis @smokeTest @toImplementOnOCIS @issue-ocis-reva-243
   Scenario Outline: getting all shares of a file with reshares
     Given using OCS API version "<ocs_api_version>"
     And these users have been created with default attributes and skeleton files:
@@ -74,7 +74,7 @@ Feature: sharing
       | 1               | 100             |
       | 2               | 200             |
 
-  @skipOnOcis @smokeTest @issue-ocis-reva-243 @issue-ocis-reva-194
+  @skipOnOcis @smokeTest @toImplementOnOCIS @issue-ocis-reva-243 @issue-ocis-reva-194
   Scenario Outline: User's own shares reshared to him don't appear when getting "shared with me" shares
     Given using OCS API version "<ocs_api_version>"
     And group "grp1" has been created
diff --git a/tests/acceptance/features/apiShareOperations/uploadToShare.feature b/tests/acceptance/features/apiShareOperations/uploadToShare.feature
index 031db05f4d01..60c51d92c3c2 100644
--- a/tests/acceptance/features/apiShareOperations/uploadToShare.feature
+++ b/tests/acceptance/features/apiShareOperations/uploadToShare.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required @skipOnOcis @issue-ocis-reva-11 @issue-ocis-reva-243
+@api @files_sharing-app-required @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-11 @issue-ocis-reva-243
 Feature: sharing
 
   Background:
diff --git a/tests/acceptance/features/apiSharePublicLink2/reShareAsPublicLink.feature b/tests/acceptance/features/apiSharePublicLink2/reShareAsPublicLink.feature
index 97468d79d506..587448293119 100644
--- a/tests/acceptance/features/apiSharePublicLink2/reShareAsPublicLink.feature
+++ b/tests/acceptance/features/apiSharePublicLink2/reShareAsPublicLink.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required @public_link_share-feature-required @skipOnOcis @issue-ocis-reva-282
+@api @files_sharing-app-required @public_link_share-feature-required @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-282
 @issue-ocis-reva-233 @issue-ocis-reva-243 @issue-ocis-reva-289
 Feature: reshare as public link
   As a user
diff --git a/tests/acceptance/features/apiSharePublicLink2/updatePublicLinkShare.feature b/tests/acceptance/features/apiSharePublicLink2/updatePublicLinkShare.feature
index 61a7b420fa33..f2caac336933 100644
--- a/tests/acceptance/features/apiSharePublicLink2/updatePublicLinkShare.feature
+++ b/tests/acceptance/features/apiSharePublicLink2/updatePublicLinkShare.feature
@@ -5,7 +5,7 @@ Feature: update a public link share
     Given using OCS API version "1"
     And user "Alice" has been created with default attributes and skeleton files
 
-  @skipOnOcis @toFixOnOCIS @toFixOnOcV10 @issue-ocis-reva-243 @issue-ocis-reva-349 @issue-37653
+  @skipOnOcis @toImplementOnOCIS @toFixOnOCIS @toFixOnOcV10 @issue-ocis-reva-243 @issue-ocis-reva-349 @issue-37653
   #after fixing all the issues merge this scenario with the one below
   Scenario Outline: API responds with a full set of parameters when owner changes the expireDate of a public share
     Given using OCS API version "<ocs_api_version>"
@@ -45,7 +45,7 @@ Feature: update a public link share
       | 1               | 100             |
       | 2               | 200             |
 
-  @skipOnOcV10 @toFixOnOCIS @toFixOnOcV10 @issue-ocis-reva-243 @issue-ocis-reva-349 @issue-37653
+  @skipOnOcV10 @toImplementOnOCIS @toFixOnOCIS @toFixOnOcV10 @issue-ocis-reva-243 @issue-ocis-reva-349 @issue-37653
   #after fixing all the issues merge this scenario with the one above
   Scenario Outline: API responds with a full set of parameters when owner changes the expireDate of a public share
     Given using OCS API version "<ocs_api_version>"
diff --git a/tests/acceptance/features/apiShareReshare1/reShare.feature b/tests/acceptance/features/apiShareReshare1/reShare.feature
index f9df8c718b81..0edd2aabdfaf 100644
--- a/tests/acceptance/features/apiShareReshare1/reShare.feature
+++ b/tests/acceptance/features/apiShareReshare1/reShare.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required @skipOnOcis @issue-ocis-reva-11 @issue-ocis-reva-243
+@api @files_sharing-app-required @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-11 @issue-ocis-reva-243
 Feature: sharing
 
   Background:
diff --git a/tests/acceptance/features/apiShareReshare2/reShareChain.feature b/tests/acceptance/features/apiShareReshare2/reShareChain.feature
index 4e195335cfcb..96363f1610df 100644
--- a/tests/acceptance/features/apiShareReshare2/reShareChain.feature
+++ b/tests/acceptance/features/apiShareReshare2/reShareChain.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required @skipOnOcis @issue-ocis-reva-243
+@api @files_sharing-app-required @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-243
 Feature: resharing can be done on a reshared resource
 
   Background:
diff --git a/tests/acceptance/features/apiShareReshare2/reShareDisabled.feature b/tests/acceptance/features/apiShareReshare2/reShareDisabled.feature
index 28d5945fb6c3..faf010fc6db1 100644
--- a/tests/acceptance/features/apiShareReshare2/reShareDisabled.feature
+++ b/tests/acceptance/features/apiShareReshare2/reShareDisabled.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required @skipOnOcis @issue-ocis-reva-243
+@api @files_sharing-app-required @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-243
 Feature: resharing can be disabled
 
   Background:
diff --git a/tests/acceptance/features/apiShareReshare2/reShareSubfolder.feature b/tests/acceptance/features/apiShareReshare2/reShareSubfolder.feature
index 452d0ed837aa..6064731c1717 100644
--- a/tests/acceptance/features/apiShareReshare2/reShareSubfolder.feature
+++ b/tests/acceptance/features/apiShareReshare2/reShareSubfolder.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required @skipOnOcis @issue-ocis-reva-243
+@api @files_sharing-app-required @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-243
 Feature: a subfolder of a received share can be reshared
 
   Background:
diff --git a/tests/acceptance/features/apiShareReshare2/reShareWhenShareWithOnlyMembershipGroups.feature b/tests/acceptance/features/apiShareReshare2/reShareWhenShareWithOnlyMembershipGroups.feature
index 0400e0c3fa3f..d368aa4e1500 100644
--- a/tests/acceptance/features/apiShareReshare2/reShareWhenShareWithOnlyMembershipGroups.feature
+++ b/tests/acceptance/features/apiShareReshare2/reShareWhenShareWithOnlyMembershipGroups.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required @skipOnOcis @issue-ocis-reva-233 @issue-ocis-reva-194 @issue-ocis-reva-243
+@api @files_sharing-app-required @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-233 @issue-ocis-reva-194 @issue-ocis-reva-243
 Feature: resharing a resource with an expiration date
 
   Background:
diff --git a/tests/acceptance/features/apiShareReshare3/reShareUpdate.feature b/tests/acceptance/features/apiShareReshare3/reShareUpdate.feature
index 8706da4fd18f..d59e2ae27c5f 100644
--- a/tests/acceptance/features/apiShareReshare3/reShareUpdate.feature
+++ b/tests/acceptance/features/apiShareReshare3/reShareUpdate.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required @skipOnOcis @issue-ocis-reva-11 @issue-ocis-reva-243
+@api @files_sharing-app-required @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-11 @issue-ocis-reva-243
 Feature: sharing
 
   Background:
diff --git a/tests/acceptance/features/apiShareUpdate/updateShare.feature b/tests/acceptance/features/apiShareUpdate/updateShare.feature
index 5ffd957d36f9..57a4fae693a7 100644
--- a/tests/acceptance/features/apiShareUpdate/updateShare.feature
+++ b/tests/acceptance/features/apiShareUpdate/updateShare.feature
@@ -5,7 +5,7 @@ Feature: sharing
     Given using OCS API version "1"
     And user "Alice" has been created with default attributes and skeleton files
 
-  @smokeTest @skipOnOcis @issue-ocis-reva-243
+  @smokeTest @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-243
   Scenario Outline: Allow modification of reshare
     Given using OCS API version "<ocs_api_version>"
     And these users have been created with default attributes and without skeleton files:
@@ -25,7 +25,7 @@ Feature: sharing
       | 1               | 100             |
       | 2               | 200             |
 
-  @skipOnOcis @issue-ocis-reva-194 @issue-ocis-reva-243
+  @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-194 @issue-ocis-reva-243
   Scenario Outline: keep group permissions in sync
     Given using OCS API version "<ocs_api_version>"
     And user "Brian" has been created with default attributes and skeleton files
@@ -56,7 +56,7 @@ Feature: sharing
       | 1               | 100             |
       | 2               | 200             |
 
-  @skipOnOcis @issue-ocis-reva-194 @issue-ocis-reva-243
+  @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-194 @issue-ocis-reva-243
   Scenario Outline: Cannot set permissions to zero
     Given using OCS API version "<ocs_api_version>"
     And group "grp1" has been created
@@ -70,7 +70,7 @@ Feature: sharing
       | 1               | 200              |
       | 2               | 400              |
 
-  @skipOnOcis @issue-ocis-reva-243
+  @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-243
   Scenario Outline: Cannot update a share of a file with a user to have only create and/or delete permission
     Given using OCS API version "<ocs_api_version>"
     And user "Brian" has been created with default attributes and without skeleton files
@@ -90,7 +90,7 @@ Feature: sharing
       | 1               | 200              | create,delete |
       | 2               | 400              | create,delete |
 
-  @skipOnOcis @issue-ocis-reva-194 @issue-ocis-reva-243
+  @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-194 @issue-ocis-reva-243
   Scenario Outline: Cannot update a share of a file with a group to have only create and/or delete permission
     Given using OCS API version "<ocs_api_version>"
     And user "Brian" has been created with default attributes and without skeleton files
@@ -112,7 +112,7 @@ Feature: sharing
       | 1               | 200              | create,delete |
       | 2               | 400              | create,delete |
 
-  @skipOnFilesClassifier @issue-files-classifier-291 @skipOnOcis @toFixOnOCIS @issue-ocis-reva-243
+  @skipOnFilesClassifier @issue-files-classifier-291 @skipOnOcis @toImplementOnOCIS @toFixOnOCIS @issue-ocis-reva-243
   Scenario: Share ownership change after moving a shared file outside of an outer share
     Given these users have been created with default attributes and without skeleton files:
       | username |
@@ -142,7 +142,7 @@ Feature: sharing
     And as "Alice" folder "/folder1/folder2" should not exist
     And as "Carol" folder "/folder2" should exist
 
-  @skipOnOcis @toFixOnOCIS @issue-ocis-reva-243
+  @skipOnOcis @toImplementOnOCIS @toFixOnOCIS @issue-ocis-reva-243
   Scenario: Share ownership change after moving a shared file to another share
     Given these users have been created with default attributes and without skeleton files:
       | username |
@@ -239,7 +239,7 @@ Feature: sharing
     And as "Alice" folder "/Alice-folder/folder2" should exist
     And as "Carol" folder "/Carol-folder/folder2" should not exist
 
-  @skipOnOcV10.3 @skipOnOcV10.4 @skipOnOcis @toFixOnOCIS @toFixOnOcV10 @issue-ocis-reva-243 @issue-ocis-reva-349 @issue-ocis-reva-350 @issue-ocis-reva-352 @issue-37653
+  @skipOnOcV10.3 @skipOnOcV10.4 @skipOnOcis @toImplementOnOCIS @toFixOnOCIS @toFixOnOcV10 @issue-ocis-reva-243 @issue-ocis-reva-349 @issue-ocis-reva-350 @issue-ocis-reva-352 @issue-37653
   #after fixing all the issues merge this scenario with the one below
   Scenario Outline: API responds with a full set of parameters when owner changes the permission of a share
     Given using OCS API version "<ocs_api_version>"
@@ -335,7 +335,7 @@ Feature: sharing
       | 1               | 100             |
       | 2               | 200             |
 
-  @skipOnOcis @issue-ocis-reva-194 @issue-ocis-reva-243
+  @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-194 @issue-ocis-reva-243
   Scenario Outline: Increasing permissions is allowed for owner
     Given using OCS API version "<ocs_api_version>"
     And user "Brian" has been created with default attributes and without skeleton files
@@ -356,7 +356,7 @@ Feature: sharing
       | 1               | 100             |
       | 2               | 200             |
 
-  @skipOnOcis @issue-ocis-reva-194 @issue-ocis-reva-243
+  @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-194 @issue-ocis-reva-243
   Scenario Outline: Forbid sharing with groups
     Given using OCS API version "<ocs_api_version>"
     And group "grp1" has been created
diff --git a/tests/acceptance/features/apiShareUpdate/updateShareGroupAndUserWithSameName.feature b/tests/acceptance/features/apiShareUpdate/updateShareGroupAndUserWithSameName.feature
index 305f573465e5..8205f4ca499d 100644
--- a/tests/acceptance/features/apiShareUpdate/updateShareGroupAndUserWithSameName.feature
+++ b/tests/acceptance/features/apiShareUpdate/updateShareGroupAndUserWithSameName.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required @skipOnOcis @issue-ocis-reva-194 @issue-ocis-reva-243
+@api @files_sharing-app-required @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-194 @issue-ocis-reva-243
 Feature: updating shares to users and groups that have the same name
 
   Background:
diff --git a/tests/acceptance/features/apiVersions/fileVersions.feature b/tests/acceptance/features/apiVersions/fileVersions.feature
index d7819fa590b4..ea0dca01927c 100644
--- a/tests/acceptance/features/apiVersions/fileVersions.feature
+++ b/tests/acceptance/features/apiVersions/fileVersions.feature
@@ -159,7 +159,7 @@ Feature: dav-versions
     Then the version folder of fileId "<<FILEID>>" for user "Brian" should contain "1" element
 
   @files_sharing-app-required
-  @skipOnOcis @issue-ocis-reva-243
+  @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-243
   Scenario: sharer of a file can see the old version information when the sharee changes the content of the file
     Given user "Brian" has been created with default attributes and without skeleton files
     And user "Alice" has uploaded file with content "First content" to "sharefile.txt"
@@ -181,7 +181,7 @@ Feature: dav-versions
 #    And the version folder of file "/sharefile.txt" for user "Alice" should contain "1" element
 
   @files_sharing-app-required
-  @skipOnOcis @issue-ocis-reva-243
+  @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-243
   Scenario: sharer of a file can restore the original content of a shared file after the file has been modified by the sharee
     Given user "Brian" has been created with default attributes and without skeleton files
     And user "Alice" has uploaded file with content "First content" to "sharefile.txt"
@@ -208,7 +208,7 @@ Feature: dav-versions
 #    And the content of file "/sharefile.txt" for user "Brian" should be "First content"
 
   @files_sharing-app-required
-  @skipOnOcis @issue-ocis-reva-243
+  @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-243
   Scenario: sharer can restore a file inside a shared folder modified by sharee
     Given user "Brian" has been created with default attributes and without skeleton files
     And user "Alice" has created folder "/sharingfolder"
@@ -221,7 +221,7 @@ Feature: dav-versions
     And the content of file "/sharingfolder/sharefile.txt" for user "Brian" should be "First content"
 
   @files_sharing-app-required
-  @skipOnOcis @issue-ocis-reva-243
+  @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-243
   Scenario: sharee can restore a file inside a shared folder modified by sharee
     Given user "Brian" has been created with default attributes and without skeleton files
     And user "Alice" has created folder "/sharingfolder"
@@ -234,7 +234,7 @@ Feature: dav-versions
     And the content of file "/sharingfolder/sharefile.txt" for user "Brian" should be "First content"
 
   @files_sharing-app-required
-  @skipOnOcis @issue-ocis-reva-243
+  @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-243
   Scenario: sharer can restore a file inside a shared folder created by sharee and modified by sharer
     Given user "Brian" has been created with default attributes and without skeleton files
     And user "Alice" has created folder "/sharingfolder"
@@ -247,7 +247,7 @@ Feature: dav-versions
     And the content of file "/sharingfolder/sharefile.txt" for user "Brian" should be "First content"
 
   @files_sharing-app-required
-  @skipOnOcis @issue-ocis-reva-243
+  @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-243
   Scenario: sharee can restore a file inside a shared folder created by sharee and modified by sharer
     Given user "Brian" has been created with default attributes and without skeleton files
     And user "Alice" has created folder "/sharingfolder"
@@ -260,7 +260,7 @@ Feature: dav-versions
     And the content of file "/sharingfolder/sharefile.txt" for user "Brian" should be "First content"
 
   @files_sharing-app-required
-  @skipOnOcis @issue-ocis-reva-243
+  @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-243
   Scenario: sharer can restore a file inside a shared folder created by sharee and modified by sharee
     Given user "Brian" has been created with default attributes and without skeleton files
     And user "Alice" has created folder "/sharingfolder"
@@ -273,7 +273,7 @@ Feature: dav-versions
     And the content of file "/sharingfolder/sharefile.txt" for user "Brian" should be "old content"
 
   @files_sharing-app-required
-  @skipOnOcis @issue-ocis-reva-243
+  @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-243
   Scenario: sharee can restore a file inside a shared folder created by sharer and modified by sharer
     Given user "Brian" has been created with default attributes and without skeleton files
     And user "Alice" has created folder "/sharingfolder"
@@ -286,7 +286,7 @@ Feature: dav-versions
     And the content of file "/sharingfolder/sharefile.txt" for user "Brian" should be "old content"
 
   @files_sharing-app-required
-  @skipOnOcis @issue-ocis-reva-243
+  @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-243
   Scenario: sharee can restore a file inside a shared folder created by sharer and modified by sharer, when the folder has been moved by the sharee
     Given user "Brian" has been created with default attributes and without skeleton files
     And user "Alice" has created folder "/sharingfolder"
@@ -301,7 +301,7 @@ Feature: dav-versions
     And the content of file "/received/sharingfolder/sharefile.txt" for user "Brian" should be "old content"
 
   @files_sharing-app-required
-  @skipOnOcis @issue-ocis-reva-243
+  @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-243
   Scenario: sharee can restore a shared file created and modified by sharer, when the file has been moved by the sharee (file is at the top level of the sharer)
     Given user "Brian" has been created with default attributes and without skeleton files
     And user "Alice" has uploaded file with content "old content" to "/sharefile.txt"
@@ -315,7 +315,7 @@ Feature: dav-versions
     And the content of file "/received/sharefile.txt" for user "Brian" should be "old content"
 
   @files_sharing-app-required
-  @skipOnOcis @issue-ocis-reva-243
+  @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-243
   Scenario: sharee can restore a shared file created and modified by sharer, when the file has been moved by the sharee (file is inside a folder of the sharer)
     Given user "Brian" has been created with default attributes and without skeleton files
     And user "Alice" has created folder "/sharingfolder"
@@ -349,7 +349,7 @@ Feature: dav-versions
     And the content of file "/sharingfolder/sharefile.txt" for user "Carol" should be "First content"
 
   @files_sharing-app-required
-  @skipOnOcis @issue-ocis-reva-243 @issue-ocis-reva-386
+  @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-243 @issue-ocis-reva-386
   Scenario Outline: Moving a file (with versions) into a shared folder as the sharee and as the sharer
     Given using <dav_version> DAV path
     And user "Brian" has been created with default attributes and without skeleton files
@@ -407,7 +407,7 @@ Feature: dav-versions
       | new         |
 
   @files_sharing-app-required
-  @skipOnOcis @issue-ocis-reva-243 @issue-ocis-reva-386
+  @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-243 @issue-ocis-reva-386
   Scenario Outline: Moving a file (with versions) out of a shared folder as the sharee and as the sharer
     Given using <dav_version> DAV path
     And user "Brian" has been created with default attributes and without skeleton files
diff --git a/tests/acceptance/features/apiWebdavProperties1/copyFile.feature b/tests/acceptance/features/apiWebdavProperties1/copyFile.feature
index 721c5fa3d390..7ab3502ee55d 100644
--- a/tests/acceptance/features/apiWebdavProperties1/copyFile.feature
+++ b/tests/acceptance/features/apiWebdavProperties1/copyFile.feature
@@ -202,7 +202,7 @@ Feature: copy file
       | old         |
       | new         |
 
-  @skipOnOcis @issue-ocis-reva-243 @issue-ocis-reva-387
+  @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-243 @issue-ocis-reva-387
   Scenario Outline: copy a file over the top of an existing folder received as a user share
     Given using <dav_version> DAV path
     And user "Brian" has been created with default attributes and without skeleton files
@@ -220,7 +220,7 @@ Feature: copy file
       | old         |
       | new         |
 
-  @skipOnOcis @issue-ocis-reva-243 @issue-ocis-reva-387
+  @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-243 @issue-ocis-reva-387
   Scenario Outline: copy a folder over the top of an existing file received as a user share
     Given using <dav_version> DAV path
     And user "Brian" has been created with default attributes and without skeleton files
@@ -237,7 +237,7 @@ Feature: copy file
       | old         |
       | new         |
 
-  @skipOnOcis @issue-ocis-reva-243 @issue-ocis-reva-387
+  @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-243 @issue-ocis-reva-387
   Scenario Outline: copy a folder into another folder at different level which is received as a user share
     Given using <dav_version> DAV path
     And user "Brian" has been created with default attributes and without skeleton files
@@ -259,7 +259,7 @@ Feature: copy file
       | old         |
       | new         |
 
-  @skipOnOcis @issue-ocis-reva-243 @issue-ocis-reva-387
+  @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-243 @issue-ocis-reva-387
   Scenario Outline: copy a file into a folder at different level received as a user share
     Given using <dav_version> DAV path
     And user "Brian" has been created with default attributes and without skeleton files
@@ -283,7 +283,7 @@ Feature: copy file
       | old         |
       | new         |
 
-  @skipOnOcis @issue-ocis-reva-243 @issue-ocis-reva-387
+  @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-243 @issue-ocis-reva-387
   Scenario Outline: copy a file into a file at different level received as a user share
     Given using <dav_version> DAV path
     And user "Brian" has been created with default attributes and without skeleton files
@@ -306,7 +306,7 @@ Feature: copy file
       | old         |
       | new         |
 
-  @skipOnOcis @issue-ocis-reva-243 @issue-ocis-reva-387
+  @skipOnOcis @toImplementOnOCIS @issue-ocis-reva-243 @issue-ocis-reva-387
   Scenario Outline: copy a folder into a file at different level received as a user share
     Given using <dav_version> DAV path
     And user "Brian" has been created with default attributes and without skeleton files