Technical merge of released branch 2.0.5-BRANCH #853

Closed tyrus-bot closed 1 year ago