Merge "use proper information" into 2.0_beta