Merge "changed Redwood --> Magnolia" into 2.0_beta