jira: [STUDIO-11883] Change-Id: I9a112b10b18d4c4f4bee5c8076b22f46fb63b13f (cherry picked from commit 15c7bb729085ec65fee8cc36a5058ac5e883ceb8)
jira:[none] Change-Id: Ic1469d30dff30e1eba92d8bfacf58d0f0b789157 (cherry picked from commit 8cfa735c6cac432a2b97dea7703e810f8eef6d04)