Technical merge of released branch 1.20-BRANCH #815

Closed tyrus-bot closed 2 years ago