jira: STUDIO-10245 Change-Id: I77e49dcbdfc3acd9473ca3885c6cc7eebdd0d3fa (cherry picked from commit 288b1eddc5e3c8e16d8b76d4360f0be40329646c)
jira: STUDIO-10245 Change-Id: I77e49dcbdfc3acd9473ca3885c6cc7eebdd0d3fa (cherry picked from commit 288b1eddc5e3c8e16d8b76d4360f0be40329646c)