upstream 3.4.5