Merge "zeus: Add torch" into gingerbread