v0.10.46 merge into windows branch