Fixed Supported for Core
Merge branch 'release/2.11' into release/12.0

* release/2.11:
  Fixed Supported for Core