jira: [STUDIO-10732] Change-Id: Ib4d55b911740cef079f38cd497d40a29ae3b1031 (cherry picked from commit 0ffcd9cc13ce7bbc1f6f96a09647e2f6afa112b1)
jira: [STUDIO-10732] Change-Id: Ib4d55b911740cef079f38cd497d40a29ae3b1031 (cherry picked from commit 0ffcd9cc13ce7bbc1f6f96a09647e2f6afa112b1)