TIMOB-6949 new PR

https://jira.appcelerator.org/browse/TIMOB-6949
create new PR