Merged changes from Xperience1080