upstream 4.7.3