Port of recent changes from SF to github
Port of recent changes from SF to github