jira: STUDIO-11242 Change-Id: I9c3484e18c3da75a5dee62523e32ac6ad6c9b207 (cherry picked from commit d5d4dc46386894b636c189da15978df11f8393c0)
jira: STUDIO-11242 Change-Id: I9c3484e18c3da75a5dee62523e32ac6ad6c9b207 (cherry picked from commit d5d4dc46386894b636c189da15978df11f8393c0)