6756-a6226c4 release/2.6
