upstream 1.3.6