Pushed to upstream

cc/ @sergiogonzalez.  Fixing source formatter warnings and Blogs failures