Pick up SMatrix changes.
Merge pull request #671 from ktf/smatrix-enable

Smatrix enable