jira:[STUDIO-13716][STUDIO-13717] Change-Id: Ib8a4d919ebfab85e07b80e60c80e9271013d05b9 (cherry picked from commit cf3c37abc2629165bfcdb1eee5b00567acde3c83)