jira:[STUDIO-9307] Change-Id: I5e45fa584a6949c77abf60894ea87b4de4ab7fce (cherry picked from commit 1b53d6d8ccb57b560394e79b8cc4de3fe79fd165)
jira:[STUDIO-9307] Change-Id: I5e45fa584a6949c77abf60894ea87b4de4ab7fce (cherry picked from commit 1b53d6d8ccb57b560394e79b8cc4de3fe79fd165)