Merge from the public gem