merge 2-3-stable