Technical merge of released branch 2.1.5-BRANCH #886

Closed tyrus-bot closed 9 months ago