jira: STUDIO-10464 Change-Id: Id42393565c5ac9d95e8d7139d3209d0fdef215ed (cherry picked from commit d244cfdae2cef9a6e4e73174fca96d7b719964b3)
jira: STUDIO-10464 Change-Id: Id42393565c5ac9d95e8d7139d3209d0fdef215ed (cherry picked from commit d244cfdae2cef9a6e4e73174fca96d7b719964b3)