Merge fixes for #10526, #10359, #11254, #9100 and the bug without number