Latest source from upstream, 5.3.23