jira: STUDIO-9659 Change-Id: I03a09dd796074d0872010672bdd85688bb7f1715 (cherry picked from commit 903b230f389ac8fce2816a8d46a0675019af0b04)
jira: STUDIO-9659 Change-Id: I03a09dd796074d0872010672bdd85688bb7f1715 (cherry picked from commit 903b230f389ac8fce2816a8d46a0675019af0b04)