[Module Tag script: logfiles 2.11.1.1]
Merge branch 'release/2.11' into release/12.0