jira: STUDIO-14677 Change-Id: I67477535ce2e88a2bded23959195ba9b95abf75a (cherry picked from commit 21e01c87b678bc4f639293363591142fc9884f2d)
jira: STUDIO-14677 Change-Id: I67477535ce2e88a2bded23959195ba9b95abf75a (cherry picked from commit 21e01c87b678bc4f639293363591142fc9884f2d)