TIMOB-16489 done

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