merged from 1.3-RC3 branch