jira: [STUDIO-14427] Change-Id: I3b765e4ea3f290bbc95616f07b416a72f60c7bc5 (cherry picked from commit 39aa7ede7f4cfee20db8f6040a17317a72c9c95e)
jira: [STUDIO-14427] Change-Id: I3b765e4ea3f290bbc95616f07b416a72f60c7bc5 (cherry picked from commit 39aa7ede7f4cfee20db8f6040a17317a72c9c95e)