Merge "Revert "Update to version 2.6.2.""