jira: STUDIO-10116 Change-Id: I489ff742f51ab8883306883ee59c98a31523fd34 (cherry picked from commit 9eee96ead7ded02c5ef1fa321b98d7a893074ef4)
jira: STUDIO-10116 Change-Id: I489ff742f51ab8883306883ee59c98a31523fd34 (cherry picked from commit 9eee96ead7ded02c5ef1fa321b98d7a893074ef4)