Technical merge of released branch 3.1.6-BRANCH