Teevra Core 3.1 branch