Merge 1.5.0-alpha2