Timob 12286 3 0 x

https://jira.appcelerator.org/browse/TIMOB-12461


Backport of https://jira.appcelerator.org/browse/TIMOB-12286