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

This reverts commit d76bdaa39bfdd4d498d9c7a92746047232141148.