Merge with 3.3x branch