sync with 1.2-SNAPSHOT