Merge from 1.3.0