6798-1360698 release/2.6
