jira: [STUDIO-12622] Change-Id: I9ee879c5bd046c9b3e1d33c96b7e3db9c9b35153 (cherry picked from commit 862fb9b53d3cda87135b93f5365608e22fc04411)
jira: [STUDIO-12622] Change-Id: I9ee879c5bd046c9b3e1d33c96b7e3db9c9b35153 (cherry picked from commit 862fb9b53d3cda87135b93f5365608e22fc04411)