TIMOB-11269 3_0_X

Backport of PR #3582 into 3_0_X

[TICKET](https://jira.appcelerator.org/browse/TIMOB-12301)