Merging back to unstable for 3.1.0