Review PR for 6.25.0

See above.