jira:[STUDIO-14359][STUDIO-14431] Change-Id: I2ecb6c78c4b28d6f14c45dbb1f905b95a9d8c4ab (cherry picked from commit f6eee61915b47321c1cb44e3ff2306875c32466b)
jira: [STUDIO-14064] Change-Id: I6a9be69033ea80c2242561c4e1b0ca5626bc7a51 (cherry picked from commit ac4af3aa1de453330fbf2d58988a6e1ea8d5d445)