MT#8653 remove already merged upstream patches