Merge with 3.4