v1.23.6: +mse240485