Merge from upstream. Prepare 1.2