Merged Pull Requests for 2.6