Technical merge of released branch 3.1.3-BRANCH