[Finishes #21857] Github bug