jira: [STUDIO-11016] Change-Id: Icbfc8d29e6b3fe5b61183796ce9976a655765264 (cherry picked from commit 1c62771c4c6c296aee536373c3c0dcc4b9c3422b)
jira: [STUDIO-11016] Change-Id: Icbfc8d29e6b3fe5b61183796ce9976a655765264 (cherry picked from commit 1c62771c4c6c296aee536373c3c0dcc4b9c3422b)