update to upstream 5.4.6