Technical merge of released branch 2.36-BRANCH