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

* release/2.10:
  Add Supported Tags

Conflicts:
	module.xml
Merge branch 'master' into develop

* master:
  Add Supported Tags