minimize diffs from master (prep for 2.5.0 release)