Update to upstream/5.4, take three