Merged with 3.x