upstream 4.6.2