KLFManager Merge to Original FORK