Import from spark repo.

SiON version 0.653