upstream 4.4.1