Merge with 3.4 #3068