Making changes to prep for 2.5.0 merge