Merge fix of 3.3