Merge remote-tracking branch '1.0.0.rc1' into 2.0.0.rc1