Storage module merge into R1.10