Update from upstream 5.2.6