update to upstream 5.3.4