merge lastest spark

merge lastest spark