bring sf-live hotfix back into sf-master