jira: STUDIO-12673 Change-Id: I5136c0ee1ce1fa30038d7c9951e2eb72fecc7b5b (cherry picked from commit d24429e64668f703b66c297549dfa962c0f1c2cb)
jira: STUDIO-12673 Change-Id: I5136c0ee1ce1fa30038d7c9951e2eb72fecc7b5b (cherry picked from commit d24429e64668f703b66c297549dfa962c0f1c2cb)