Merge changes from latest update.