More updates for the upcoming 2.6 release