jira: [STUDIO-9504] Change-Id: I8457b6beaccc30492e1275926a7213c8ce328d15 (cherry picked from commit e86b061473799e34efce53abeb8954e591d87836)
jira: [STUDIO-9504] Change-Id: I8457b6beaccc30492e1275926a7213c8ce328d15 (cherry picked from commit e86b061473799e34efce53abeb8954e591d87836)