am 8487c937: Merge "More inclusive rules for using outsets." into cw-d-mr1-dev

* commit '8487c937fb7eb8159e472011074eaa5f5d51405e':
  More inclusive rules for using outsets.