@witty-crayon-22786: I'll wait for your fix to go upstream and then rebase, update, and release after CI is green