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