fix ticket number being referenced
merging release/2.10 with release/2.11 to fix ticker number being referenced
Merge branch 'release/2.11' into release/12.0

* release/2.11:
  fix ticket number being referenced