3.1.0 with patches