Initial commit from 1.3 release