diff --git a/BACKPORT_TODO b/BACKPORT_TODO
new file mode 100644
index 0000000000..5ee7fec1c5
--- /dev/null
+++ b/BACKPORT_TODO
@@ -0,0 +1,8 @@
+Error on backporting to branch 2.0.x, error on cherry picking baf8723ae992a00aae60ea502b2bf98d6dc0e811:
+
+
+
+To continue do:
+git fetch && git checkout backport/706-to-2.0.x && git reset --hard HEAD^
+git cherry-pick baf8723ae992a00aae60ea502b2bf98d6dc0e811
+git push origin backport/706-to-2.0.x --force