upstream 3.4.4