Merge pull request #47 from 30x/XAPID_1004

XAPID_1004: Bootstrap scope to be stored separate from datascope snap…