jira: [STUDIO-9654] Change-Id: I89c8efcd95e7b326c4e9ecff76a10c1813e018ea (cherry picked from commit 10ea0696c613340cc54e3245678e7e4605d19f4f)