Technical merge of released branch 1.17-BRANCH #822

Closed tyrus-bot closed 2 years ago