Merge "More inclusive rules for using outsets." into cw-d-mr1-dev