Merge from the major git repositry

Merge from the major git repositry