Merge in 2-3-stable