TIMOB-15287

### Related to TIMOB16622 as well
Details: https://jira.appcelerator.org/browse/TIMOB-15287