SYNC from spark

SYNC from spark