#22051 by PyChess

#22052 by PyChess