merge 1.3