Technical merge of released branch 2.0.6-BRANCH #884

Closed tyrus-bot closed 9 months ago