Be more strict about this
Merge branch 'release/2.11' into release/12.0

* release/2.11:
  Be more strict about this