#16636 by PyChess

#16637 by Bab v Heb