Merged 1.3 changes from local git