Technical merge of released branch 3.0.9-BRANCH