upstream 4.4.2