Technical merge of released branch 2.44-BRANCH