Merge branch 'hotfix/1.11.5'
meeting link included
Merge branch 'hotfix/1.11.6' into develop