Merge from 1.2 into 1.3