diff --git a/build/pkgs/configure/checksums.ini b/build/pkgs/configure/checksums.ini
index d703578547b..5eef8adc280 100644
--- a/build/pkgs/configure/checksums.ini
+++ b/build/pkgs/configure/checksums.ini
@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=d00890d9ecb95b96d06007dd383ce32d7eb2d814
-md5=54f3dfffc2ce304135d3db1c0aad5905
-cksum=649734943
+sha1=05caac1a984eb6c2ae7aed8d01dce1cf41a93dd0
+md5=f425a3cc0aa611363076006dd4659089
+cksum=3402047038
diff --git a/build/pkgs/configure/package-version.txt b/build/pkgs/configure/package-version.txt
index 3ecdf8dba78..1daf270b7bf 100644
--- a/build/pkgs/configure/package-version.txt
+++ b/build/pkgs/configure/package-version.txt
@@ -1 +1 @@
-a84c11dd8244bf18bcc4bfe5fe4e6adde20ff9ff
+6ad03ae83b3f55d2b85bfe1d9d877fec5acd9f7b
diff --git a/src/sage/combinat/root_system/plot.py b/src/sage/combinat/root_system/plot.py
index 34c178cef8f..a1eec40e8df 100644
--- a/src/sage/combinat/root_system/plot.py
+++ b/src/sage/combinat/root_system/plot.py
@@ -1349,7 +1349,7 @@ def cone(self, rays=[], lines=[], color="black", thickness=1, alpha=1, wireframe
         - ``alpha`` -- a number in the interval `[0, 1]` (default: `1`)
           the desired transparency
 
-        - ``label`` -- an object to be used as for this cone.
+        - ``label`` -- an object to be used as the label for this cone.
           The label itself will be constructed by calling
           :func:`~sage.misc.latex.latex` or :func:`repr` on the
           object depending on the graphics backend.
diff --git a/src/sage/plot/arrow.py b/src/sage/plot/arrow.py
index 179e026d2e4..26bb131f713 100644
--- a/src/sage/plot/arrow.py
+++ b/src/sage/plot/arrow.py
@@ -489,7 +489,8 @@ def arrow(tailpoint=None, headpoint=None, **kwds):
 
 
 @rename_keyword(color='rgbcolor')
-@options(width=2, rgbcolor=(0,0,1), zorder=2, head=1, linestyle='solid', legend_label=None)
+@options(width=2, rgbcolor=(0,0,1), zorder=2, head=1, linestyle='solid',
+         legend_label=None, legend_color=None)
 def arrow2d(tailpoint=None, headpoint=None, path=None, **options):
     """
     If ``tailpoint`` and ``headpoint`` are provided, returns an arrow from
@@ -640,6 +641,12 @@ def arrow2d(tailpoint=None, headpoint=None, path=None, **options):
     ::
 
         sage: arrow2d((-2,2), (7,1)).show(frame=True)
+
+    TESTS:
+
+    Verify that :issue:`36153` is fixed::
+
+        sage: A = arrow2d((-1,-1), (2,3), legend_label="test")
     """
     from sage.plot.all import Graphics
     g = Graphics()
diff --git a/src/sage/plot/circle.py b/src/sage/plot/circle.py
index 41281b66735..c7fd3d9dfc0 100644
--- a/src/sage/plot/circle.py
+++ b/src/sage/plot/circle.py
@@ -406,6 +406,10 @@ def circle(center, radius, **options):
         sage: P = circle((1,1), 1)
         sage: P.aspect_ratio()
         1.0
+
+    Verify that :issue:`36153` does not arise::
+
+        sage: C = circle((1,1), 1, legend_label="test")
     """
     from sage.plot.all import Graphics
 
diff --git a/src/sage/plot/disk.py b/src/sage/plot/disk.py
index 91891b84550..3b2c72051b9 100644
--- a/src/sage/plot/disk.py
+++ b/src/sage/plot/disk.py
@@ -247,7 +247,7 @@ def plot3d(self, z=0, **kwds):
 
 @rename_keyword(color='rgbcolor')
 @options(alpha=1, fill=True, rgbcolor=(0, 0, 1), thickness=0, legend_label=None,
-         aspect_ratio=1.0)
+         legend_color=None, aspect_ratio=1.0)
 def disk(point, radius, angle, **options):
     r"""
     A disk (that is, a sector or wedge of a circle) with center
@@ -346,6 +346,10 @@ def disk(point, radius, angle, **options):
         Traceback (most recent call last):
         ...
         ValueError: the center point of a plotted disk should have two or three coordinates
+
+    Verify that :issue:`36153` is fixed::
+
+        sage: D = disk((0, 0), 5, (0, pi/2), legend_label="test")
     """
     from sage.plot.all import Graphics
     g = Graphics()
diff --git a/src/sage/plot/ellipse.py b/src/sage/plot/ellipse.py
index 791b719fe68..821906ecf0a 100644
--- a/src/sage/plot/ellipse.py
+++ b/src/sage/plot/ellipse.py
@@ -345,6 +345,11 @@ def ellipse(center, r1, r2, angle=0, **options):
         E=ellipse((0,0),2,1,legend_label="My ellipse", legend_color='green')
         sphinx_plot(E)
 
+    TESTS:
+
+    Verify that :issue:`36153` does not arise::
+
+        sage: E = ellipse((0,0), 2, 1, legend_label="test")
     """
     from sage.plot.all import Graphics
     g = Graphics()
diff --git a/src/sage/plot/point.py b/src/sage/plot/point.py
index 2bbe8cef07a..7e880ca3c1c 100644
--- a/src/sage/plot/point.py
+++ b/src/sage/plot/point.py
@@ -579,6 +579,10 @@ def point2d(points, **options):
 
        sage: point2d(iter([]))
        Graphics object consisting of 0 graphics primitives
+
+    Verify that :issue:`36153` does not arise::
+
+        sage: P = point((0.5, 0.5), legend_label="test")
     """
     from sage.plot.plot import xydata_from_point_list
     from sage.plot.all import Graphics
diff --git a/src/sage/plot/polygon.py b/src/sage/plot/polygon.py
index 6f2c2b3f78b..a2159fcfb56 100644
--- a/src/sage/plot/polygon.py
+++ b/src/sage/plot/polygon.py
@@ -524,10 +524,15 @@ def polygon2d(points, **options):
         sage: polygon2d([[1,2], [5,6], [5,0]]).aspect_ratio()
         1.0
 
+    TESTS:
+
+    Verify that :issue:`36153` does not arise::
+
+        sage: P = polygon2d([[1,2], [5,6], [5,0]], legend_label="test")
+
     AUTHORS:
 
     - David Joyner (2006-04-14): the long list of examples above.
-
     """
     from sage.plot.plot import xydata_from_point_list
     from sage.plot.all import Graphics