V2.0.0 cr1

support v2.0.0-CR1.
NOT WORKING WITH 1.3.0