jira: [STUDIO-9412] Change-Id: I530a8c18ae4b4133526b3e9d91153a7b26512f38 (cherry picked from commit c23f1233db2be6475a434de575fe93c9c08fae75)
jira: [STUDIO-9412] Change-Id: I530a8c18ae4b4133526b3e9d91153a7b26512f38 (cherry picked from commit c23f1233db2be6475a434de575fe93c9c08fae75)