Jacalvo/upgrade from 3.0