Remove Code from 2.10 that breaks 2.11+
Merge branch 'release/2.11' into release/12.0

* release/2.11:
  Remove Code from 2.10 that breaks 2.11+