jira: [STUDIO-9581] Change-Id: I1cea4547d9b436ca29932d0d5724dedf42eadc8f (cherry picked from commit 09a6a3695be229f655adbb10b820134d4922479e)