jira: [STUDIO-10531] Change-Id: I59b12a4efe181a98093bbbd5d3c341613609fc8e (cherry picked from commit 379e6314367a82a4e065f02355b853c4e068e75d)
jira: [STUDIO-9275] Change-Id: I8105828183d42496eed77793daa1c1a618e252bf (cherry picked from commit 478fc597c4b0f054c93bef954f3ca1054111b4b3)