Merge version with CrimsonJacket