jira: STUDIO-9954 Change-Id: I93a808651a84b6fa30de608a7e21d5ca722f200c (cherry picked from commit 492033182c2795b7798c1a57f80c0e7b9ec08cc6)
jira: STUDIO-9954 Change-Id: I93a808651a84b6fa30de608a7e21d5ca722f200c (cherry picked from commit 492033182c2795b7798c1a57f80c0e7b9ec08cc6)