Technical merge of released branch 2.37-BRANCH