Technical merge of released branch 3.0.15-BRANCH