Merge "SF Crash Bug fix"