Merged in latest changes

Cancel this request.