Major updates as part of batch update for 3.0.0.