TIMOB-1356 new PR

https://jira.appcelerator.org/browse/TIMOB-1356