End the comment. End all the comments
Merge branch 'release/2.11' into release/12.0

* release/2.11:
  End the comment. End all the comments

Conflicts:
	amp_conf/bin/module_admin