jira: [STUDIO-13803] Change-Id: I1cf256e1b1b4ffd7f6cd5c2b33042502d4f58e0b (cherry picked from commit 75d32fe7a71ac4289ee9f21a52c3f26fd27f89b4)
jira: [STUDIO-13803] Change-Id: I1cf256e1b1b4ffd7f6cd5c2b33042502d4f58e0b (cherry picked from commit 75d32fe7a71ac4289ee9f21a52c3f26fd27f89b4)