jira: [STUDIO-12917] Change-Id: I74f816a21beb2dfb4191bb73298882efd22a6191 (cherry picked from commit 4f0f4fc64802d777d11105d433e59f57168bfd66)
jira: [STUDIO-12917] Change-Id: I74f816a21beb2dfb4191bb73298882efd22a6191 (cherry picked from commit 4f0f4fc64802d777d11105d433e59f57168bfd66)