Update on release/3.0