timob-12332: Backport 3_0_X: TIMOB-12150 

https://jira.appcelerator.org/browse/TIMOB-12332
Test steps in https://jira.appcelerator.org/browse/TIMOB-12150