Merged front end changes