Cherry Pick Fixes 

Cherry picking fixes for 2.7 branch