draw-polygon' on pairs instead of
Closes PR 12455 original commit: 5bfaea25febcc8d50a75861c692aecfc3cb49876