upstream 2.2.5