In-progress updates for 2.5.2 release