upstream 4.7.2