JIRA: [STUDIO-13844] Change-Id: I9840e120c9857dc33923858b022da439e5b92784 (cherry picked from commit d8a07b47fbfa2b628d56658e9c45b0926eb6fcd8)
JIRA: [STUDIO-13609] Change-Id: I591de7033360b9570600006cfbce2148a8d031d5 (cherry picked from commit e9c774be8f4c89b8dafa14ef56913612fb68bd0c)