v1.23.4: +mse240486