Technical merge of released branch 3.0.12-BRANCH