merge 6-2-stable