Merged in docs from 5.25 release