Technical merge of released branch 3.0.14-BRANCH