Merge with the 3.3.0 brunch