upstream 04.12