new upstream 3.5.3