diff --git a/032661cf9785dcaa4260dec2c08c4b9ab0ad055e b/032661cf9785dcaa4260dec2c08c4b9ab0ad055e
index 484630c0e..ba5827f14 100644
--- a/032661cf9785dcaa4260dec2c08c4b9ab0ad055e
+++ b/032661cf9785dcaa4260dec2c08c4b9ab0ad055e
@@ -23,6 +23,30 @@
       "revId": "032661cf9785dcaa4260dec2c08c4b9ab0ad055e",
       "serverId": "4a232e18-c5a9-48ee-94c0-e04e7cca6543"
     },
+    {
+      "unresolved": true,
+      "key": {
+        "uuid": "ba442a98_3f42428a",
+        "filename": "/COMMIT_MSG",
+        "patchSetId": 12
+      },
+      "lineNbr": 7,
+      "author": {
+        "id": 33492
+      },
+      "writtenOn": "2022-05-17T01:55:40Z",
+      "side": 1,
+      "message": "I fixed it in PS13.",
+      "parentUuid": "94b430d8_8722e30c",
+      "range": {
+        "startLine": 7,
+        "startChar": 4,
+        "endLine": 7,
+        "endChar": 13
+      },
+      "revId": "032661cf9785dcaa4260dec2c08c4b9ab0ad055e",
+      "serverId": "4a232e18-c5a9-48ee-94c0-e04e7cca6543"
+    },
     {
       "unresolved": true,
       "key": {
@@ -46,6 +70,30 @@
       "revId": "032661cf9785dcaa4260dec2c08c4b9ab0ad055e",
       "serverId": "4a232e18-c5a9-48ee-94c0-e04e7cca6543"
     },
+    {
+      "unresolved": true,
+      "key": {
+        "uuid": "5708bc85_43c1cd93",
+        "filename": "/COMMIT_MSG",
+        "patchSetId": 12
+      },
+      "lineNbr": 11,
+      "author": {
+        "id": 33492
+      },
+      "writtenOn": "2022-05-17T01:55:40Z",
+      "side": 1,
+      "message": "I fixed it in PS13.",
+      "parentUuid": "8a33266f_dce51117",
+      "range": {
+        "startLine": 11,
+        "startChar": 56,
+        "endLine": 11,
+        "endChar": 65
+      },
+      "revId": "032661cf9785dcaa4260dec2c08c4b9ab0ad055e",
+      "serverId": "4a232e18-c5a9-48ee-94c0-e04e7cca6543"
+    },
     {
       "unresolved": true,
       "key": {
@@ -69,6 +117,30 @@
       "revId": "032661cf9785dcaa4260dec2c08c4b9ab0ad055e",
       "serverId": "4a232e18-c5a9-48ee-94c0-e04e7cca6543"
     },
+    {
+      "unresolved": true,
+      "key": {
+        "uuid": "d9670fe3_160ae56e",
+        "filename": "/COMMIT_MSG",
+        "patchSetId": 12
+      },
+      "lineNbr": 14,
+      "author": {
+        "id": 33492
+      },
+      "writtenOn": "2022-05-17T01:55:40Z",
+      "side": 1,
+      "message": "I fixed it in PS13.",
+      "parentUuid": "6dc2cefe_31ee0e2a",
+      "range": {
+        "startLine": 14,
+        "startChar": 7,
+        "endLine": 14,
+        "endChar": 12
+      },
+      "revId": "032661cf9785dcaa4260dec2c08c4b9ab0ad055e",
+      "serverId": "4a232e18-c5a9-48ee-94c0-e04e7cca6543"
+    },
     {
       "unresolved": false,
       "key": {
@@ -109,6 +181,30 @@
       "revId": "032661cf9785dcaa4260dec2c08c4b9ab0ad055e",
       "serverId": "4a232e18-c5a9-48ee-94c0-e04e7cca6543"
     },
+    {
+      "unresolved": true,
+      "key": {
+        "uuid": "7d10e499_9a189404",
+        "filename": "tacker/tests/functional/common/fake_grant_server.py",
+        "patchSetId": 12
+      },
+      "lineNbr": 131,
+      "author": {
+        "id": 33492
+      },
+      "writtenOn": "2022-05-17T01:55:40Z",
+      "side": 1,
+      "message": "I fixed it in PS13.",
+      "parentUuid": "0ead43f1_c298dea1",
+      "range": {
+        "startLine": 131,
+        "startChar": 46,
+        "endLine": 131,
+        "endChar": 52
+      },
+      "revId": "032661cf9785dcaa4260dec2c08c4b9ab0ad055e",
+      "serverId": "4a232e18-c5a9-48ee-94c0-e04e7cca6543"
+    },
     {
       "unresolved": true,
       "key": {
@@ -155,6 +251,54 @@
       "revId": "032661cf9785dcaa4260dec2c08c4b9ab0ad055e",
       "serverId": "4a232e18-c5a9-48ee-94c0-e04e7cca6543"
     },
+    {
+      "unresolved": true,
+      "key": {
+        "uuid": "e55128c8_018b67d5",
+        "filename": "tacker/tests/functional/common/fake_grant_server.py",
+        "patchSetId": 12
+      },
+      "lineNbr": 139,
+      "author": {
+        "id": 33492
+      },
+      "writtenOn": "2022-05-17T01:55:40Z",
+      "side": 1,
+      "message": "I fixed it in PS13.",
+      "parentUuid": "71b2b237_a31b875e",
+      "range": {
+        "startLine": 139,
+        "startChar": 27,
+        "endLine": 139,
+        "endChar": 44
+      },
+      "revId": "032661cf9785dcaa4260dec2c08c4b9ab0ad055e",
+      "serverId": "4a232e18-c5a9-48ee-94c0-e04e7cca6543"
+    },
+    {
+      "unresolved": true,
+      "key": {
+        "uuid": "ed0bc26d_2453c195",
+        "filename": "tacker/tests/functional/common/fake_grant_server.py",
+        "patchSetId": 12
+      },
+      "lineNbr": 139,
+      "author": {
+        "id": 33492
+      },
+      "writtenOn": "2022-05-17T01:55:40Z",
+      "side": 1,
+      "message": "I fixed it in PS13.",
+      "parentUuid": "d7078b74_91df0616",
+      "range": {
+        "startLine": 139,
+        "startChar": 46,
+        "endLine": 139,
+        "endChar": 68
+      },
+      "revId": "032661cf9785dcaa4260dec2c08c4b9ab0ad055e",
+      "serverId": "4a232e18-c5a9-48ee-94c0-e04e7cca6543"
+    },
     {
       "unresolved": true,
       "key": {
@@ -178,6 +322,30 @@
       "revId": "032661cf9785dcaa4260dec2c08c4b9ab0ad055e",
       "serverId": "4a232e18-c5a9-48ee-94c0-e04e7cca6543"
     },
+    {
+      "unresolved": true,
+      "key": {
+        "uuid": "0b364a66_2f834b1c",
+        "filename": "tacker/tests/functional/common/fake_grant_server.py",
+        "patchSetId": 12
+      },
+      "lineNbr": 292,
+      "author": {
+        "id": 33492
+      },
+      "writtenOn": "2022-05-17T01:55:40Z",
+      "side": 1,
+      "message": "I fixed it in PS13.",
+      "parentUuid": "e58187ee_cb45541a",
+      "range": {
+        "startLine": 291,
+        "startChar": 31,
+        "endLine": 292,
+        "endChar": 44
+      },
+      "revId": "032661cf9785dcaa4260dec2c08c4b9ab0ad055e",
+      "serverId": "4a232e18-c5a9-48ee-94c0-e04e7cca6543"
+    },
     {
       "unresolved": true,
       "key": {
@@ -201,6 +369,30 @@
       "revId": "032661cf9785dcaa4260dec2c08c4b9ab0ad055e",
       "serverId": "4a232e18-c5a9-48ee-94c0-e04e7cca6543"
     },
+    {
+      "unresolved": true,
+      "key": {
+        "uuid": "df8e7773_36efcc53",
+        "filename": "tacker/tests/functional/common/fake_grant_server.py",
+        "patchSetId": 12
+      },
+      "lineNbr": 312,
+      "author": {
+        "id": 33492
+      },
+      "writtenOn": "2022-05-17T01:55:40Z",
+      "side": 1,
+      "message": "I fixed it in PS13.",
+      "parentUuid": "dc9facb1_79a311ab",
+      "range": {
+        "startLine": 311,
+        "startChar": 4,
+        "endLine": 312,
+        "endChar": 31
+      },
+      "revId": "032661cf9785dcaa4260dec2c08c4b9ab0ad055e",
+      "serverId": "4a232e18-c5a9-48ee-94c0-e04e7cca6543"
+    },
     {
       "unresolved": true,
       "key": {
@@ -224,6 +416,30 @@
       "revId": "032661cf9785dcaa4260dec2c08c4b9ab0ad055e",
       "serverId": "4a232e18-c5a9-48ee-94c0-e04e7cca6543"
     },
+    {
+      "unresolved": true,
+      "key": {
+        "uuid": "01ecfcf7_a97bf9f0",
+        "filename": "tacker/tests/functional/common/fake_grant_server.py",
+        "patchSetId": 12
+      },
+      "lineNbr": 483,
+      "author": {
+        "id": 33492
+      },
+      "writtenOn": "2022-05-17T01:55:40Z",
+      "side": 1,
+      "message": "I fixed it in PS13.",
+      "parentUuid": "95ec2e6a_d5e6c6df",
+      "range": {
+        "startLine": 482,
+        "startChar": 0,
+        "endLine": 483,
+        "endChar": 20
+      },
+      "revId": "032661cf9785dcaa4260dec2c08c4b9ab0ad055e",
+      "serverId": "4a232e18-c5a9-48ee-94c0-e04e7cca6543"
+    },
     {
       "unresolved": true,
       "key": {
@@ -247,6 +463,30 @@
       "revId": "032661cf9785dcaa4260dec2c08c4b9ab0ad055e",
       "serverId": "4a232e18-c5a9-48ee-94c0-e04e7cca6543"
     },
+    {
+      "unresolved": true,
+      "key": {
+        "uuid": "34a5b009_43185cce",
+        "filename": "tacker/tests/functional/sol_separated_nfvo_v2/fake_grant_v2.py",
+        "patchSetId": 12
+      },
+      "lineNbr": 256,
+      "author": {
+        "id": 33492
+      },
+      "writtenOn": "2022-05-17T01:55:40Z",
+      "side": 1,
+      "message": "I fixed it in PS13.",
+      "parentUuid": "0525cad9_cb7ad9d3",
+      "range": {
+        "startLine": 256,
+        "startChar": 13,
+        "endLine": 256,
+        "endChar": 27
+      },
+      "revId": "032661cf9785dcaa4260dec2c08c4b9ab0ad055e",
+      "serverId": "4a232e18-c5a9-48ee-94c0-e04e7cca6543"
+    },
     {
       "unresolved": true,
       "key": {
@@ -270,6 +510,30 @@
       "revId": "032661cf9785dcaa4260dec2c08c4b9ab0ad055e",
       "serverId": "4a232e18-c5a9-48ee-94c0-e04e7cca6543"
     },
+    {
+      "unresolved": true,
+      "key": {
+        "uuid": "4a52e361_aceed80a",
+        "filename": "tacker/tests/functional/sol_separated_nfvo_v2/fake_grant_v2.py",
+        "patchSetId": 12
+      },
+      "lineNbr": 275,
+      "author": {
+        "id": 33492
+      },
+      "writtenOn": "2022-05-17T01:55:40Z",
+      "side": 1,
+      "message": "ditto",
+      "parentUuid": "c8e5d2c6_c10d1d8a",
+      "range": {
+        "startLine": 275,
+        "startChar": 13,
+        "endLine": 275,
+        "endChar": 27
+      },
+      "revId": "032661cf9785dcaa4260dec2c08c4b9ab0ad055e",
+      "serverId": "4a232e18-c5a9-48ee-94c0-e04e7cca6543"
+    },
     {
       "unresolved": true,
       "key": {
@@ -293,6 +557,30 @@
       "revId": "032661cf9785dcaa4260dec2c08c4b9ab0ad055e",
       "serverId": "4a232e18-c5a9-48ee-94c0-e04e7cca6543"
     },
+    {
+      "unresolved": true,
+      "key": {
+        "uuid": "1b2b39f5_9312abe9",
+        "filename": "tacker/tests/functional/sol_separated_nfvo_v2/fake_grant_v2.py",
+        "patchSetId": 12
+      },
+      "lineNbr": 309,
+      "author": {
+        "id": 33492
+      },
+      "writtenOn": "2022-05-17T01:55:40Z",
+      "side": 1,
+      "message": "ditto",
+      "parentUuid": "ba08a23b_e54dcf31",
+      "range": {
+        "startLine": 309,
+        "startChar": 17,
+        "endLine": 309,
+        "endChar": 31
+      },
+      "revId": "032661cf9785dcaa4260dec2c08c4b9ab0ad055e",
+      "serverId": "4a232e18-c5a9-48ee-94c0-e04e7cca6543"
+    },
     {
       "unresolved": true,
       "key": {
@@ -315,6 +603,30 @@
       },
       "revId": "032661cf9785dcaa4260dec2c08c4b9ab0ad055e",
       "serverId": "4a232e18-c5a9-48ee-94c0-e04e7cca6543"
+    },
+    {
+      "unresolved": true,
+      "key": {
+        "uuid": "3c02aecb_27566c6a",
+        "filename": "tacker/tests/functional/sol_separated_nfvo_v2/fake_grant_v2.py",
+        "patchSetId": 12
+      },
+      "lineNbr": 331,
+      "author": {
+        "id": 33492
+      },
+      "writtenOn": "2022-05-17T01:55:40Z",
+      "side": 1,
+      "message": "ditto",
+      "parentUuid": "f2de07c9_6a9fc460",
+      "range": {
+        "startLine": 331,
+        "startChar": 13,
+        "endLine": 331,
+        "endChar": 27
+      },
+      "revId": "032661cf9785dcaa4260dec2c08c4b9ab0ad055e",
+      "serverId": "4a232e18-c5a9-48ee-94c0-e04e7cca6543"
     }
   ]
 }
\ No newline at end of file
diff --git a/e9ea3e6475837534806b64e5336ba2022bfa4a9b b/e9ea3e6475837534806b64e5336ba2022bfa4a9b
new file mode 100644
index 000000000..64e486c10
--- /dev/null
+++ b/e9ea3e6475837534806b64e5336ba2022bfa4a9b
@@ -0,0 +1,21 @@
+{
+  "comments": [
+    {
+      "unresolved": false,
+      "key": {
+        "uuid": "da0ab9f8_57232a2b",
+        "filename": "/PATCHSET_LEVEL",
+        "patchSetId": 13
+      },
+      "lineNbr": 0,
+      "author": {
+        "id": 33492
+      },
+      "writtenOn": "2022-05-17T01:55:40Z",
+      "side": 1,
+      "message": "To Ayumu Ueha:\nThank you for your comments. I fixed them in PS13.\nPlease kindly check them again.",
+      "revId": "e9ea3e6475837534806b64e5336ba2022bfa4a9b",
+      "serverId": "4a232e18-c5a9-48ee-94c0-e04e7cca6543"
+    }
+  ]
+}
\ No newline at end of file