jira: [STUDIO-10386] Change-Id: I2debe9eebf455e4adbe9161945ce84508f594f9d (cherry picked from commit 26881072a44d755335931a3f800bc7548744acc5)
jira: [STUDIO-10386] Change-Id: I2debe9eebf455e4adbe9161945ce84508f594f9d (cherry picked from commit 26881072a44d755335931a3f800bc7548744acc5)