merge 1.2.2-dev
merge 1.2.2-dev