upstream 4.2.6, patch1 merged upstream