Technical merge of released branch 3.0.13-BRANCH