Merged Xperience1080 changes