Merged latest changes.