Refinements to SA prepare resources
Merge pull request #965 from shenrie/master

Refinements to SA prepare resources