Technical merge of released branch 3.1.5-BRANCH