Technical merge of released branch 3.0.11-BRANCH