Merge pull request #293 from PrismorSec/feat/data-boundary