Merged changes from front.