upstream 3.4.6