#19074 by zorro

#19075 by PyChess