issues-456061-patch