jira: STUDIO-9994 Change-Id: Id0d2ebd8dd68854f5cc1c821c7453b75852b8ba7 (cherry picked from commit 012d90bd7e546be17b654a2f71e90628ffd596e5)
jira: STUDIO-9994 Change-Id: Id0d2ebd8dd68854f5cc1c821c7453b75852b8ba7 (cherry picked from commit 012d90bd7e546be17b654a2f71e90628ffd596e5)