Updated gemlock based on merge.