timob-12164: Backport 3_0_X: TIMOB-11526 

https://jira.appcelerator.org/browse/TIMOB-12164
Test steps in my comment in https://jira.appcelerator.org/browse/TIMOB-11526