add sp in S_Handler
Merge branch 'gs'