Enable new boundaries in staging