jira: [STUDIO-13841] Change-Id: Iff594cd1f6dcd5c6485ab0aa67c98f422a75fd6c (cherry picked from commit f8d0f62a1b3f3379de40a3b845c06fe61d907d82)
JIRA: [STUDIO-13609] Change-Id: I591de7033360b9570600006cfbce2148a8d031d5 (cherry picked from commit e9c774be8f4c89b8dafa14ef56913612fb68bd0c)