Technical merge of released branch 3.0.10-BRANCH