Upstream 3.0.71 -> 3.0.72