Merge in v3.4 changes