XisVisibilityBoundary update
M2M Refactor (Phase 12)