Merged with 3.1