jira: [STUDIO-11578] Change-Id: Ifdcf6d285d763a15ed153508cb4f5f66069144bc (cherry picked from commit f97931d191ecb7a40af7e6176b80384328d2143b)
jira: [STUDIO-11578] Change-Id: Ifdcf6d285d763a15ed153508cb4f5f66069144bc (cherry picked from commit f97931d191ecb7a40af7e6176b80384328d2143b)