v1.25.4: +mse84296, +mse240102