Technical merge of released branch 2.48-BRANCH