jira: [STUDIO-8518] Change-Id: Ida64d94ab44e71473096ae55ef2db50d7c8286ca (cherry picked from commit 93446f05e1f4b53a8db6067acb4ac5bd1e53cff5)
jira: [STUDIO-8518] Change-Id: Ida64d94ab44e71473096ae55ef2db50d7c8286ca (cherry picked from commit 93446f05e1f4b53a8db6067acb4ac5bd1e53cff5)