[CLC-1812] SIS import rewrite
Merge pull request #1090 from yuhunglin/CLC-1812

[CLC-1812] SIS import rewrite