3 Days Ago
merge from jungle_update (fixes optimizations)