jira: [STUDIO-11598] Change-Id: Ia10fc3bd67b61a28480b38eef0c28a088c10135e (cherry picked from commit 9b585239f7137c43cbd766540e93401dbe5e82e4)
jira: [STUDIO-11598] Change-Id: Ia10fc3bd67b61a28480b38eef0c28a088c10135e (cherry picked from commit 9b585239f7137c43cbd766540e93401dbe5e82e4)