[Module Tag script: conferences 2.11.0.4]
Merge branch 'release/2.11' into develop