Move wrapper prop to 2.1
automerge: 09fbd39  -s ours

* commit '09fbd3949bf1a6e0bf8861c3d5b75d0470c4025e':
  Move wrapper prop to 2.1