KLFCommon Merge to Original FORK