Merge remote-tracking branch 'slim/lp5.0' into lp