Import Trinity 3.3.5 Archive Branch