Merge in v1.2.0-beta.3