Technical merge of released branch 1.19-BRANCH #794

Closed senivam closed 2 years ago