XPerience changes

Change-Id: I2ee5a06ea91eacb237d7331da40895f7690ce8ca