2.3.0 code merged with 3.0