Merge "Snap for 8067920 from bd27e9ffc3592fd7459470d612c4a33cc43f6e1d to studio-2021.1-release" into studio-2021.1-release