Merge Mater to R1.06 Branch