Technical merge of released branch 2.42-BRANCH