Bring forward fixes to entire from r151008 branch