Add Supported Tags
Merge branch 'release/2.10' into release/2.11