Merge changes from branch 2019.3
Merge changes from branch 2019.3