Merge of v2.0.0-beta2