Partial Merge of KLFManager to test