jira:[STUDIO-9610] Change-Id: I32e7d6701f12e32facd5b0ac536129526582c954 (cherry picked from commit 44db9102ae538b0558ff7f14bfc588e59558ee5b)
jira:[STUDIO-9610] Change-Id: I32e7d6701f12e32facd5b0ac536129526582c954 (cherry picked from commit 44db9102ae538b0558ff7f14bfc588e59558ee5b)