jira: [STUDIO-10758] Change-Id: I34246998b08c54ef8e44172300ab3e1d4e4bf5c4 (cherry picked from commit f2f6b290230b11e984d7e729b56bbe1c666879c8)
jira: [STUDIO-10758] Change-Id: I34246998b08c54ef8e44172300ab3e1d4e4bf5c4 (cherry picked from commit f2f6b290230b11e984d7e729b56bbe1c666879c8)