Jira: STUDIO-14795 Change-Id: I202bdaa70ea7d997e617e757ea95f759a9bb18de (cherry picked from commit 3da903e492216685d74b621cb4966f5a06ff885e)
Jira: STUDIO-14795 Change-Id: I202bdaa70ea7d997e617e757ea95f759a9bb18de (cherry picked from commit 3da903e492216685d74b621cb4966f5a06ff885e)