Update for Release_2_beta_2