Timob 12582

Test is in [JIRA](https://jira.appcelerator.org/browse/TIMOB-12582) comments.