Release/2.5.0

Pull changes for release 2.5.3 into develop to complete docs for 2.6.0.