merge into lp5.0