pre-merge 1.1