TIMOB-11971 3_0_X

Back port of PR #3535

[TICKET](https://jira.appcelerator.org/browse/TIMOB-12302)