upstream 5.2