Latest source from upstream, 5.4.17