new upstream 3.6.3