Merge in gator version 5.18