merge 1.2.2-dev