TIMOB-7739 new PR

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