Merge in upstream 4.4.0