TIMOB-13998- new PR

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