jira: STUDIO-12303 Change-Id: Ic994e71a265511cf4e93009707815d34c2d79054 (cherry picked from commit 312c12f10735bcf180c2f2338cc4fdeb75e3b6a3)
jira: STUDIO-12303 Change-Id: Ic994e71a265511cf4e93009707815d34c2d79054 (cherry picked from commit 312c12f10735bcf180c2f2338cc4fdeb75e3b6a3)