Merge branch 'feature-lp' into master

Change-Id: I2efd0bf044c07b8cdaf03ab62a9b6b71a76b8b09