KNNFramework: unused imports.
MatchMap: unknown change.
Merge origin/master