Merge from 1.3