Merging new barbarian changes.