v1.15.10: +mse233470, +mse231981, expand mse230388